define $etc_dir and fixed to use it.

newml command creates $etc_dir.

4 files changed, 50 insertions, 34 deletions

diff --git a/fml/etc/src/config.cf.en/acl.cf b/fml/etc/src/config.cf.en/acl.cf
index 44582b08..03796580 100644
--- a/fml/etc/src/config.cf.en/acl.cf
+++ b/fml/etc/src/config.cf.en/acl.cf
@@ -182,7 +182,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.
@@ -191,7 +191,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/src/config.cf.en/directory.cf b/fml/etc/src/config.cf.en/directory.cf
index ab872cdb..b82ea0f6 100644
--- a/fml/etc/src/config.cf.en/directory.cf
+++ b/fml/etc/src/config.cf.en/directory.cf
@@ -25,21 +25,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
@@ -86,6 +87,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
diff --git a/fml/etc/src/config.cf.ja/acl.cf b/fml/etc/src/config.cf.ja/acl.cf
index 570c1ce2..dbf2da5d 100644
--- a/fml/etc/src/config.cf.ja/acl.cf
+++ b/fml/etc/src/config.cf.ja/acl.cf
@@ -184,7 +184,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: リモート管理者のパスワードファイル(群)
@@ -193,7 +193,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 モデレータメンバーとみなされるのは誰か？
diff --git a/fml/etc/src/config.cf.ja/directory.cf b/fml/etc/src/config.cf.ja/directory.cf
index dc4b1d2c..1ae12f48 100644
--- a/fml/etc/src/config.cf.ja/directory.cf
+++ b/fml/etc/src/config.cf.ja/directory.cf
@@ -25,21 +25,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
@@ -91,6 +92,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