remove $gpg_config_dir, $pgp_config_dir.

define $article_post_{auth,encrypt}_{pgp,gpg}_config_dir and
${admin_,}command_mail_auth_{pgp,gpg}_config_dir.

2 files changed, 124 insertions, 16 deletions

diff --git a/fml/etc/src/config.cf.en/pgp.cf b/fml/etc/src/config.cf.en/pgp.cf
index a0b7bb83..4bb66070 100644
--- a/fml/etc/src/config.cf.en/pgp.cf
+++ b/fml/etc/src/config.cf.en/pgp.cf
@@ -1,17 +1,71 @@
 =head1 PGP
 
 
-# Descriptions: Pretty Good Privacy
-#      History:  
+=head2 authentication by pgp
+
+
+# Descriptions: pgp configurations for article authentication.
+#      History: $DIST_AUTH_KEYRING_DIR
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/article_post_auth/pgp
+article_post_auth_pgp_config_dir	= $etc_dir/article_post_auth/pgp
+
+# Descriptions: pgp configurations for (user) commnad mail authentication.
+#      History: none
 #        Value: DIR
-#     Examples: /var/spool/ml/elena/etc/pgp
-pgp_config_dir = $etc_dir/pgp
+#     Examples: /var/spool/ml/elena/etc/command_mail_auth/pgp
+command_mail_auth_pgp_config_dir	= $etc_dir/command_mail_auth/pgp
+
+# Descriptions: pgp configurations for admin commnad mail authentication.
+#      History: $ADMIN_AUTH_KEYRING_DIR
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/admin_command_mail_auth/pgp
+admin_command_mail_auth_pgp_config_dir	= $etc_dir/admin_command_mail_auth/pgp
+
+
+=head2 encryption by pgp
+
+
+# Descriptions: pgp configurations for article encryption.
+#      History: $DIST_ENCRYPT_KEYRING_DIR
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/article_post_encrypt/pgp
+article_post_encrypt_pgp_config_dir	= $etc_dir/article_post_encrypt/pgp
+
+
+
+=head1 GPG
+
+
+=head2 authentication by gpg
+
+
+# Descriptions: gpg configurations for article authentication.
+#      History: $DIST_AUTH_KEYRING_DIR
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/article_post_auth/gpg
+article_post_auth_gpg_config_dir	= $etc_dir/article_post_auth/gpg
+
+# Descriptions: gpg configurations for (user) commnad mail authentication.
+#      History: none
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/command_mail_auth/gpg
+command_mail_auth_gpg_config_dir	= $etc_dir/command_mail_auth/gpg
+
+# Descriptions: gpg configurations for admin commnad mail authentication.
+#      History: $ADMIN_AUTH_KEYRING_DIR
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/admin_command_mail_auth/gpg
+admin_command_mail_auth_gpg_config_dir	= $etc_dir/admin_command_mail_auth/gpg
+
+
+=head2 encryption by gpg
 
 
-# Descriptions: GNU Pvivary Guard
-#      History: 
+# Descriptions: gpg configurations for article encryption.
+#      History: $DIST_ENCRYPT_KEYRING_DIR
 #        Value: DIR
-#     Examples: /var/spool/ml/elena/etc/gpg
-gpg_config_dir = $etc_dir/gpg
+#     Examples: /var/spool/ml/elena/etc/article_post_encrypt/gpg
+article_post_encrypt_gpg_config_dir	= $etc_dir/article_post_encrypt/gpg
 
 
diff --git a/fml/etc/src/config.cf.ja/pgp.cf b/fml/etc/src/config.cf.ja/pgp.cf
index a0b7bb83..4bb66070 100644
--- a/fml/etc/src/config.cf.ja/pgp.cf
+++ b/fml/etc/src/config.cf.ja/pgp.cf
@@ -1,17 +1,71 @@
 =head1 PGP
 
 
-# Descriptions: Pretty Good Privacy
-#      History:  
+=head2 authentication by pgp
+
+
+# Descriptions: pgp configurations for article authentication.
+#      History: $DIST_AUTH_KEYRING_DIR
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/article_post_auth/pgp
+article_post_auth_pgp_config_dir	= $etc_dir/article_post_auth/pgp
+
+# Descriptions: pgp configurations for (user) commnad mail authentication.
+#      History: none
 #        Value: DIR
-#     Examples: /var/spool/ml/elena/etc/pgp
-pgp_config_dir = $etc_dir/pgp
+#     Examples: /var/spool/ml/elena/etc/command_mail_auth/pgp
+command_mail_auth_pgp_config_dir	= $etc_dir/command_mail_auth/pgp
+
+# Descriptions: pgp configurations for admin commnad mail authentication.
+#      History: $ADMIN_AUTH_KEYRING_DIR
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/admin_command_mail_auth/pgp
+admin_command_mail_auth_pgp_config_dir	= $etc_dir/admin_command_mail_auth/pgp
+
+
+=head2 encryption by pgp
+
+
+# Descriptions: pgp configurations for article encryption.
+#      History: $DIST_ENCRYPT_KEYRING_DIR
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/article_post_encrypt/pgp
+article_post_encrypt_pgp_config_dir	= $etc_dir/article_post_encrypt/pgp
+
+
+
+=head1 GPG
+
+
+=head2 authentication by gpg
+
+
+# Descriptions: gpg configurations for article authentication.
+#      History: $DIST_AUTH_KEYRING_DIR
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/article_post_auth/gpg
+article_post_auth_gpg_config_dir	= $etc_dir/article_post_auth/gpg
+
+# Descriptions: gpg configurations for (user) commnad mail authentication.
+#      History: none
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/command_mail_auth/gpg
+command_mail_auth_gpg_config_dir	= $etc_dir/command_mail_auth/gpg
+
+# Descriptions: gpg configurations for admin commnad mail authentication.
+#      History: $ADMIN_AUTH_KEYRING_DIR
+#        Value: DIR
+#     Examples: /var/spool/ml/elena/etc/admin_command_mail_auth/gpg
+admin_command_mail_auth_gpg_config_dir	= $etc_dir/admin_command_mail_auth/gpg
+
+
+=head2 encryption by gpg
 
 
-# Descriptions: GNU Pvivary Guard
-#      History: 
+# Descriptions: gpg configurations for article encryption.
+#      History: $DIST_ENCRYPT_KEYRING_DIR
 #        Value: DIR
-#     Examples: /var/spool/ml/elena/etc/gpg
-gpg_config_dir = $etc_dir/gpg
+#     Examples: /var/spool/ml/elena/etc/article_post_encrypt/gpg
+article_post_encrypt_gpg_config_dir	= $etc_dir/article_post_encrypt/gpg