regen: $etc_dir

6 files changed, 74 insertions, 38 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index 4e5f0b3b..db41e52e 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -733,6 +733,7 @@ _file$ {
 
 _dir$ {
           $db_dir
+          $etc_dir
           $event_queue_dir
           $listinfo_base_dir
           $listinfo_dir
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index 40c0e93a..519ffc5b 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -57,7 +57,7 @@ admin_member_password_maps</entry>
  all password files.</entry>
 <entry>
 $primary_admin_member_password_map
-   file:$ml_home_dir/etc/passwd
+   file:$etc_dir/passwd
    </entry>
 </row>
 <row>
@@ -647,6 +647,15 @@ error_analyzer_simple_count_limit</entry>
 </row>
 <row>
 <entry>
+etc_dir</entry>
+<entry>
+ etc directory</entry>
+<entry>
+$ml_home_dir/etc
+   </entry>
+</row>
+<row>
+<entry>
 event_queue_dir</entry>
 <entry>
  event queue directory for scheduler</entry>
@@ -1211,7 +1220,7 @@ primary_admin_member_password_map</entry>
 <entry>
  primary password file to authenticate remote administrator </entry>
 <entry>
-file:$ml_home_dir/etc/passwd-admin
+file:$etc_dir/passwd-admin
    </entry>
 </row>
 <row>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index 4e5f0b3b..db41e52e 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -733,6 +733,7 @@ _file$ {
 
 _dir$ {
           $db_dir
+          $etc_dir
           $event_queue_dir
           $listinfo_base_dir
           $listinfo_dir
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 5236491b..ad7ffe37 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -57,7 +57,7 @@ admin_member_password_maps</entry>
  リモート管理者のパスワードファイル(群)</entry>
 <entry>
 $primary_admin_member_password_map
-   file:$ml_home_dir/etc/passwd
+   file:$etc_dir/passwd
    </entry>
 </row>
 <row>
@@ -630,6 +630,15 @@ error_analyzer_simple_count_limit</entry>
 </row>
 <row>
 <entry>
+etc_dir</entry>
+<entry>
+ パスワードファイルなどを置くディレクトリ</entry>
+<entry>
+$ml_home_dir/etc
+   </entry>
+</row>
+<row>
+<entry>
 event_queue_dir</entry>
 <entry>
  イヴェントのキューディレクトリ</entry>
@@ -1203,7 +1212,7 @@ primary_admin_member_password_map</entry>
 <entry>
  リモート管理者のパスワードファイル</entry>
 <entry>
-file:$ml_home_dir/etc/passwd-admin
+file:$etc_dir/passwd-admin
    </entry>
 </row>
 <row>
diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 0c1d4cf5..82204591 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -116,21 +116,22 @@ directory_private_mode	=	0700
 
 
 newml_command_init_public_directories	=	$domain_config_base_dir
-					$domain_mail_config_dir
-					$domain_postfix_config_dir
-					$domain_qmail_config_dir
-					$domain_exim_config_dir
-					$domain_sendmail_config_dir
-					$domain_procmail_config_dir
-					$shared_db_dir
-					$udb_base_dir
-
-newml_command_init_private_directories	=	$tmp_dir
-					$spool_dir
-					$var_dir
-					$db_dir
-					$error_analyzer_cache_dir
-					$lock_dir
+						$domain_mail_config_dir
+						$domain_postfix_config_dir
+						$domain_qmail_config_dir
+						$domain_exim_config_dir
+						$domain_sendmail_config_dir
+						$domain_procmail_config_dir
+						$shared_db_dir
+						$udb_base_dir
+
+newml_command_init_private_directories	=	$etc_dir
+						$tmp_dir
+						$spool_dir
+						$var_dir
+						$db_dir
+						$error_analyzer_cache_dir
+						$lock_dir
 
 
 =head2 fml system directories
@@ -177,6 +178,13 @@ udb_base_dir	= $ml_home_prefix/@udb@
 =head2 ML specific
 
 
+# Descriptions: etc directory
+#      History: none
+#        Value: directory
+#     Examples: /etc/spool/ml/elena/etc
+etc_dir		= $ml_home_dir/etc
+
+
 # Descriptions: directory hoding
 #               multi-purpose log, temporary, transient, and spool files
 #      History: $VAR_DIR
@@ -448,7 +456,7 @@ admin_recipient_maps		=	$primary_admin_recipient_map
 #      History: 4.0's $PASSWD_FILE
 #        Value: file
 #     Examples: /var/spool/ml/elena/etc/passwd
-primary_admin_member_password_map = file:$ml_home_dir/etc/passwd-admin
+primary_admin_member_password_map = file:$etc_dir/passwd-admin
 
 
 # Descriptions: all password files.
@@ -457,7 +465,7 @@ primary_admin_member_password_map = file:$ml_home_dir/etc/passwd-admin
 #        Value:
 #     Examples:
 admin_member_password_maps	=	$primary_admin_member_password_map
-					file:$ml_home_dir/etc/passwd
+					file:$etc_dir/passwd
 
 
 =head2 moderator
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 2d28052a..21855894 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -119,21 +119,22 @@ directory_private_mode	=	0700
 
 
 newml_command_init_public_directories	=	$domain_config_base_dir
-					$domain_mail_config_dir
-					$domain_postfix_config_dir
-					$domain_qmail_config_dir
-					$domain_exim_config_dir
-					$domain_sendmail_config_dir
-					$domain_procmail_config_dir
-					$shared_db_dir
-					$udb_base_dir
-
-newml_command_init_private_directories	=	$tmp_dir
-					$spool_dir
-					$var_dir
-					$db_dir
-					$error_analyzer_cache_dir
-					$lock_dir
+						$domain_mail_config_dir
+						$domain_postfix_config_dir
+						$domain_qmail_config_dir
+						$domain_exim_config_dir
+						$domain_sendmail_config_dir
+						$domain_procmail_config_dir
+						$shared_db_dir
+						$udb_base_dir
+
+newml_command_init_private_directories	=	$etc_dir
+						$tmp_dir
+						$spool_dir
+						$var_dir
+						$db_dir
+						$error_analyzer_cache_dir
+						$lock_dir
 
 
 =head2 fml system directories
@@ -185,6 +186,13 @@ udb_base_dir	= $ml_home_prefix/@udb@
 =head2 ML 固有
 
 
+# Descriptions: パスワードファイルなどを置くディレクトリ
+#      History: none
+#        Value: directory
+#     Examples: /var/spool/ml/elena/etc
+etc_dir		= $ml_home_dir/etc
+
+
 # Descriptions: さまざまな目的につかう
 #               multi-purpose log, temporary, transient, and spool files
 #      History: $VAR_DIR
@@ -459,7 +467,7 @@ admin_recipient_maps		=	$primary_admin_recipient_map
 #      History: 4.0 の $PASSWD_FILE
 #        Value: file
 #     Examples: /var/spool/ml/elena/etc/passwd
-primary_admin_member_password_map = file:$ml_home_dir/etc/passwd-admin
+primary_admin_member_password_map = file:$etc_dir/passwd-admin
 
 
 # Descriptions: リモート管理者のパスワードファイル(群)
@@ -468,7 +476,7 @@ primary_admin_member_password_map = file:$ml_home_dir/etc/passwd-admin
 #        Value:
 #     Examples:
 admin_member_password_maps	=	$primary_admin_member_password_map
-					file:$ml_home_dir/etc/passwd
+					file:$etc_dir/passwd
 
 
 =head2 モデレータメンバーとみなされるのは誰か？