regen: pgp,gpg and fetchfml

3 files changed, 271 insertions, 20 deletions

diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index 18b2e56d..3d6f5e8d 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -16,6 +16,10 @@ admin {
 
    admin_command { 
     ?     $admin_command_mail_allowed_commands
+          $admin_command_mail_auth_gpg_config_dir
+    ?     $admin_command_mail_auth_gpg_config_dir_alias
+          $admin_command_mail_auth_pgp_config_dir
+    ?     $admin_command_mail_auth_pgp_config_dir_alias
           $admin_command_mail_restrictions
    }
 
@@ -85,6 +89,10 @@ article {
    article_post { 
     ?     $article_post_address
     ?     $article_post_article_thread_lifetime
+          $article_post_auth_gpg_config_dir
+          $article_post_auth_pgp_config_dir
+          $article_post_encrypt_gpg_config_dir
+          $article_post_encrypt_pgp_config_dir
           $article_post_restrictions
           $article_post_restrictions_reject_notice_data_type
           $use_article_post_function
@@ -152,6 +160,8 @@ command {
 
    command_mail { 
     ?     $command_mail_address
+          $command_mail_auth_gpg_config_dir
+          $command_mail_auth_pgp_config_dir
           $command_mail_line_length_limit
     ?     $command_mail_reply_prompt
           $command_mail_restrictions
@@ -366,6 +376,35 @@ error {
    }
 }
 
+fetchfml {
+
+   fetchfml { 
+    ?     $fetchfml_fetch_protocol
+    ?     $fetchfml_imap_server
+    ?     $fetchfml_pop_server
+          $fetchfml_queue_dir
+          $use_fetchfml_function
+   }
+
+   fetchfml_article_post { 
+    ?     $fetchfml_article_post_password
+    ?     $fetchfml_article_post_user
+          $use_fetchfml_article_post_function
+   }
+
+   fetchfml_command_mail { 
+    ?     $fetchfml_command_mail_password
+    ?     $fetchfml_command_mail_user
+          $use_fetchfml_command_mail_function
+   }
+
+   fetchfml_error_mail_analyzer { 
+    ?     $fetchfml_error_mail_analyzer_password
+    ?     $fetchfml_error_mail_analyzer_user
+          $use_fetchfml_error_mail_analyzer_function
+   }
+}
+
 html {
 
    html_archive { 
@@ -794,12 +833,10 @@ _dir$ {
           $db_dir
           $etc_dir
           $event_queue_dir
-          $gpg_config_dir
           $listinfo_base_dir
           $listinfo_dir
           $listinfo_template_dir
           $ml_admin_cgi_base_dir
-          $pgp_config_dir
           $shared_db_dir
           $tmp_dir
           $udb_base_dir
diff --git a/fml/doc/ja/tutorial/variables/filter.rules.sgml b/fml/doc/ja/tutorial/variables/filter.rules.sgml
index f561e0f3..03a0bfa8 100644
--- a/fml/doc/ja/tutorial/variables/filter.rules.sgml
+++ b/fml/doc/ja/tutorial/variables/filter.rules.sgml
@@ -410,6 +410,14 @@ path_bogofilter           = @BOGOFILTER@
 # $faker_run_start_hook = q{ 1;};
 # $faker_verify_request_end_hook = q{ 1;};
 # $faker_verify_request_start_hook = q{ 1;};
+# $fetchfml_finish_end_hook = q{ 1;};
+# $fetchfml_finish_start_hook = q{ 1;};
+# $fetchfml_prepare_end_hook = q{ 1;};
+# $fetchfml_prepare_start_hook = q{ 1;};
+# $fetchfml_run_end_hook = q{ 1;};
+# $fetchfml_run_start_hook = q{ 1;};
+# $fetchfml_verify_request_end_hook = q{ 1;};
+# $fetchfml_verify_request_start_hook = q{ 1;};
 # $fmladdr_finish_end_hook = q{ 1;};
 # $fmladdr_finish_start_hook = q{ 1;};
 # $fmladdr_prepare_end_hook = q{ 1;};
@@ -450,6 +458,14 @@ path_bogofilter           = @BOGOFILTER@
 # $fmlhtmlify_run_start_hook = q{ 1;};
 # $fmlhtmlify_verify_request_end_hook = q{ 1;};
 # $fmlhtmlify_verify_request_start_hook = q{ 1;};
+# $fmlpgp_finish_end_hook = q{ 1;};
+# $fmlpgp_finish_start_hook = q{ 1;};
+# $fmlpgp_prepare_end_hook = q{ 1;};
+# $fmlpgp_prepare_start_hook = q{ 1;};
+# $fmlpgp_run_end_hook = q{ 1;};
+# $fmlpgp_run_start_hook = q{ 1;};
+# $fmlpgp_verify_request_end_hook = q{ 1;};
+# $fmlpgp_verify_request_start_hook = q{ 1;};
 # $makefml_finish_end_hook = q{ 1;};
 # $makefml_finish_start_hook = q{ 1;};
 # $makefml_prepare_end_hook = q{ 1;};
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 286bca44..d595bc61 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -32,6 +32,42 @@ $cgi_base_dir/admin
 </row>
 <row>
 <entry>
+admin_command_mail_auth_gpg_config_dir</entry>
+<entry>
+ gpg configurations for admin commnad mail authentication.</entry>
+<entry>
+$etc_dir/gpg-admin-command-mail-auth
+   </entry>
+</row>
+<row>
+<entry>
+admin_command_mail_auth_gpg_config_dir_alias</entry>
+<entry>
+ conventional naming </entry>
+<entry>
+$etc_dir/gpg-admin
+   </entry>
+</row>
+<row>
+<entry>
+admin_command_mail_auth_pgp_config_dir</entry>
+<entry>
+ pgp configurations for admin commnad mail authentication.</entry>
+<entry>
+$etc_dir/pgp-admin-command-mail-auth
+   </entry>
+</row>
+<row>
+<entry>
+admin_command_mail_auth_pgp_config_dir_alias</entry>
+<entry>
+ conventional naming </entry>
+<entry>
+$etc_dir/pgp-admin
+   </entry>
+</row>
+<row>
+<entry>
 admin_command_mail_restrictions</entry>
 <entry>
  admin コマンドへの制限</entry>
@@ -167,6 +203,42 @@ article_post_article_thread_lifetime</entry>
 </row>
 <row>
 <entry>
+article_post_auth_gpg_config_dir</entry>
+<entry>
+ gpg configurations for article authentication.</entry>
+<entry>
+$etc_dir/gpg-article-post-auth
+   </entry>
+</row>
+<row>
+<entry>
+article_post_auth_pgp_config_dir</entry>
+<entry>
+ pgp configurations for article authentication.</entry>
+<entry>
+$etc_dir/pgp-article-post-auth
+   </entry>
+</row>
+<row>
+<entry>
+article_post_encrypt_gpg_config_dir</entry>
+<entry>
+ gpg configurations for article encryption.</entry>
+<entry>
+$etc_dir/gpg-article-post-encrypt
+   </entry>
+</row>
+<row>
+<entry>
+article_post_encrypt_pgp_config_dir</entry>
+<entry>
+ pgp configurations for article encryption.</entry>
+<entry>
+$etc_dir/pgp-article-post-encrypt
+   </entry>
+</row>
+<row>
+<entry>
 article_post_restrictions</entry>
 <entry>
  投稿への制限</entry>
@@ -433,6 +505,24 @@ confirmation
 </row>
 <row>
 <entry>
+command_mail_auth_gpg_config_dir</entry>
+<entry>
+ gpg configurations for (user) commnad mail authentication.</entry>
+<entry>
+$etc_dir/gpg-command-mail-auth
+   </entry>
+</row>
+<row>
+<entry>
+command_mail_auth_pgp_config_dir</entry>
+<entry>
+ pgp configurations for (user) commnad mail authentication.</entry>
+<entry>
+$etc_dir/pgp-command-mail-auth
+   </entry>
+</row>
+<row>
+<entry>
 command_mail_filter_reject_notice_data_type</entry>
 <entry>
  弾いたメールをどのようにフォワードするか？</entry>
@@ -767,29 +857,110 @@ $var_dir/event/queue
 </row>
 <row>
 <entry>
-file_default_mode</entry>
+fetchfml_article_post_password</entry>
 <entry>
- ファイルを作成する時のデフォルトモード</entry>
+ password to fetch article messages for $ml_name ML</entry>
 <entry>
-0600
+********
    </entry>
 </row>
 <row>
 <entry>
-get_command_request_limit</entry>
+fetchfml_article_post_user</entry>
 <entry>
- get コマンドで指定できる記事数の上限。</entry>
+ username to fetch article messages for $ml_name ML</entry>
 <entry>
-100
+$ml_name
+   </entry>
+</row>
+<row>
+<entry>
+fetchfml_command_mail_password</entry>
+<entry>
+ password to fetch command messages for $ml_name ML</entry>
+<entry>
+********
+   </entry>
+</row>
+<row>
+<entry>
+fetchfml_command_mail_user</entry>
+<entry>
+ username to fetch command messages for $ml_name ML</entry>
+<entry>
+$ml_name-ctl
    </entry>
 </row>
 <row>
 <entry>
-gpg_config_dir</entry>
+fetchfml_error_mail_analyzer_password</entry>
 <entry>
- GNU Pvivary Guard</entry>
+ password to fetch error messages for $ml_name ML</entry>
 <entry>
-$etc_dir/gpg
+********
+   </entry>
+</row>
+<row>
+<entry>
+fetchfml_error_mail_analyzer_user</entry>
+<entry>
+ username to fetch error messages for $ml_name ML</entry>
+<entry>
+$ml_name-admin
+   </entry>
+</row>
+<row>
+<entry>
+fetchfml_fetch_protocol</entry>
+<entry>
+ protocol to fetch messages.</entry>
+<entry>
+pop3
+   </entry>
+</row>
+<row>
+<entry>
+fetchfml_imap_server</entry>
+<entry>
+ imap server fetchfml process uses.</entry>
+<entry>
+localhost
+   </entry>
+</row>
+<row>
+<entry>
+fetchfml_pop_server</entry>
+<entry>
+ pop server fetchfml process uses.</entry>
+<entry>
+localhost
+   </entry>
+</row>
+<row>
+<entry>
+fetchfml_queue_dir</entry>
+<entry>
+ queue_dir fetchfml uses as temporary incoming queue </entry>
+<entry>
+$var_dir/mail/fetchfml
+   </entry>
+</row>
+<row>
+<entry>
+file_default_mode</entry>
+<entry>
+ ファイルを作成する時のデフォルトモード</entry>
+<entry>
+0600
+   </entry>
+</row>
+<row>
+<entry>
+get_command_request_limit</entry>
+<entry>
+ get コマンドで指定できる記事数の上限。</entry>
+<entry>
+100
    </entry>
 </row>
 <row>
@@ -1363,15 +1534,6 @@ $ml_name
 </row>
 <row>
 <entry>
-pgp_config_dir</entry>
-<entry>
- Pretty Good Privacy</entry>
-<entry>
-$etc_dir/pgp
-   </entry>
-</row>
-<row>
-<entry>
 postfix_verp_delimiters</entry>
 <entry>
  verps delimieters used in postfix</entry>
@@ -1997,6 +2159,42 @@ ${use_error_analyzer_program:-yes}
 </row>
 <row>
 <entry>
+use_fetchfml_article_post_function</entry>
+<entry>
+ use fetchfml article_post function or not.</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+use_fetchfml_command_mail_function</entry>
+<entry>
+ use fetchfml command_mail function or not.</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+use_fetchfml_error_mail_analyzer_function</entry>
+<entry>
+ use fetchfml error_mail_analyzer function or not.</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+use_fetchfml_function</entry>
+<entry>
+ use fetchfml function or not.</entry>
+<entry>
+no
+   </entry>
+</row>
+<row>
+<entry>
 use_html_archive</entry>
 <entry>
  記事を HTML 化するか否か</entry>