update / merge todo list

define DBMS configurations prototype

6 files changed, 125 insertions, 55 deletions

diff --git a/fml/etc/default_config.cf.ja b/fml/etc/default_config.cf.ja
index 467c1725..8c9d0fd1 100644
--- a/fml/etc/default_config.cf.ja
+++ b/fml/etc/default_config.cf.ja
@@ -211,6 +211,47 @@ ticket_sequence_file	=	$ml_home_dir/ticket.seq
 # top directory
 ticket_db_dir		=	$shared_db_dir/ticket
 
+=head1	データベースとの連携
+
+use_database	=	no
+
+# value: mysql postgresql ldap
+database_method	=	mysql
+
+database_model	=	toymodel
+
+# うー？
+# DATABASE_CACHE_FILE_SUFFIX:
+
+=head2	SQL の場合
+
+sql_servers		=
+
+#
+# sql_port		=
+
+sql_user		=	fml
+
+sql_use_password	=
+
+sql_database_name	=	fml
+
+
+
+=head2	LDAP の場合
+
+ldap_servers		=
+
+# ldap_port		=
+
+ldap_server_password	=	
+
+ldap_search_base	=	
+
+ldap_server_bind	=	
+
+ldap_query_filter	=	
+
 =head1	プログラムのパス名
 
 # 
diff --git a/fml/etc/defaults/Configurations b/fml/etc/defaults/Configurations
index 183591f4..b0e446e9 100644
--- a/fml/etc/defaults/Configurations
+++ b/fml/etc/defaults/Configurations
@@ -8,6 +8,7 @@ log.cf
 spool.cf
 command.cf
 tickets.cf
+dbms.cf
 paths.cf
 system_dependence.cf
 __end__.cf
diff --git a/fml/etc/defaults/dbms.cf.ja b/fml/etc/defaults/dbms.cf.ja
new file mode 100644
index 00000000..a3632f3b
--- /dev/null
+++ b/fml/etc/defaults/dbms.cf.ja
@@ -0,0 +1,40 @@
+=head1	データベースとの連携
+
+use_database	=	no
+
+# value: mysql postgresql ldap
+database_method	=	mysql
+
+database_model	=	toymodel
+
+# うー？
+# DATABASE_CACHE_FILE_SUFFIX:
+
+=head2	SQL の場合
+
+sql_servers		=
+
+#
+# sql_port		=
+
+sql_user		=	fml
+
+sql_use_password	=
+
+sql_database_name	=	fml
+
+
+
+=head2	LDAP の場合
+
+ldap_servers		=
+
+# ldap_port		=
+
+ldap_server_password	=	
+
+ldap_search_base	=	
+
+ldap_server_bind	=	
+
+ldap_query_filter	=	
diff --git a/fml/lib/FML/Ticket/00_DESIGN.txt b/fml/lib/FML/Ticket/00_DESIGN.txt
index 415de9e3..e7af69ef 100644
--- a/fml/lib/FML/Ticket/00_DESIGN.txt
+++ b/fml/lib/FML/Ticket/00_DESIGN.txt
@@ -15,3 +15,26 @@ Ticket::Model::toymol   Ticket::Model::toymol2   .......
 	$ticket = new Ticket::Model::toymodel;
 	$ticket->asign($curproc, $args);
 	$ticket->update_cache($curproc, $args);
+
+
+=head1 REFERENCE
+
+=head2 ticket status ("RT" case)
+                
+A Request will always be in one of the following four states:
+
+    Open -- the Request is expecting imminent action a/o updates
+ Stalled -- the Request needs a specific action or piece of
+            information before it can proceed
+Resolved -- the Request has either been answered or successfully
+            taken care of, and no longer needs action
+    Dead -- the request should not have been in the ticketing system to begin
+            with and has been completely purged.
+
+=head2 "REQ" case
+
+       Another somewhat hardcoded features is the "status" field.
+       We're not exactly sure how to use this yet,  but  normally
+       use  "stalled" to indicate that this request isn't one can
+       make any progress at the moment, thus isn't worth  picking
+       from the queue to work on.
diff --git a/regress/simulation/TODO b/regress/simulation/TODO
index e9ee1d8d..c70a79f8 100644
--- a/regress/simulation/TODO
+++ b/regress/simulation/TODO
@@ -1,46 +1,33 @@
-$default_umask
+=head1	すけじゅーら
 
+alarm() によるスケジューラ
 
-loop_check
 
-    MAIL_LIST != MAINTAINER
+=head1	るーぷちぇっく
 
-time_zone config?
+	loop_check
 
-newsyslog()
+	MAIL_LIST != MAINTAINER
 
-mode-expire
-mode-archive
-mode-html-generator
 
-alarm() 
+=head1	いるかな?
 
-MIME Content Handler(include backword compatible)
+	$default_umask
 
-log suffix extension
+	time_zone config?
 
-chaddr を認証の前にトラップすること( libtrap.pl )
+=head1	まーだだよ 
 
-5.0 では ReloadMySelf() って必要ないような気がするが…
+	newsyslog()
 
+	mode-expire
 
+	mode-archive
 
-*** ticket status (RT)
-                
-A Request will always be in one of the following four states:
+	mode-html-generator
 
-    Open -- the Request is expecting imminent action a/o updates
- Stalled -- the Request needs a specific action or piece of
-            information before it can proceed
-Resolved -- the Request has either been answered or successfully
-            taken care of, and no longer needs action
-    Dead -- the request should not have been in the ticketing system to begin
-            with and has been completely purged.
+	MIME Content Handler(include backword compatible)
 
-(REQ)
+	log suffix extension
 
-       Another somewhat hardcoded features is the "status" field.
-       We're not exactly sure how to use this yet,  but  normally
-       use  "stalled" to indicate that this request isn't one can
-       make any progress at the moment, thus isn't worth  picking
-       from the queue to work on.
+	chaddr を認証の前にトラップすること( libtrap.pl )
diff --git a/regress/simulation/TODO-MANIFEST b/regress/simulation/TODO-MANIFEST
index d5019d60..3860cd36 100644
--- a/regress/simulation/TODO-MANIFEST
+++ b/regress/simulation/TODO-MANIFEST
@@ -288,6 +288,10 @@ LOGFILE_NEWSYSLOG_LIMIT:
 
 AMLIST_NEWSYSLOG_LIMIT:	150K
 
+
+
+
+
 AUTO_HTML_GEN:
 
 HTML_THREAD:			1
@@ -319,29 +323,3 @@ HTML_MULTIPART_IMAGE_REF_TYPE:
 
 HTML_DEFAULT_UMASK:
 HTML_WRITE_UMASK:
-
-USE_DATABASE:
-
-DATABASE_METHOD:
-
-DATABASE_CACHE_FILE_SUFFIX:
-
-DATABASE_DRIVER: toymodel.pl
-
-SQL_SERVER_HOST:
-
-SQL_SERVER_PORT:
-
-SQL_SERVER_USER:
-
-SQL_DATABASE_NAME:
-
-SQL_SERVER_PASSWORD:
-
-SQL_DATABASE_NAME:
-
-LDAP_SERVER_HOST:
-LDAP_SERVER_PASSWORD:
-LDAP_SEARCH_BASE:
-LDAP_SERVER_BIND:
-LDAP_QUERY_FILTER: