regen: isolation related changes.

*_restrictions: reject* -> isolate*
+          $isolated_queue_dir
+          $isolated_queue_expire_limit

4 files changed, 110 insertions, 24 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index bc877a84..1c7f5a51 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -951,6 +951,7 @@ _dir$ {
           $db_dir
           $etc_dir
           $event_queue_dir
+          $isolated_queue_dir
           $listinfo_base_dir
           $listinfo_dir
           $listinfo_template_dir
@@ -965,6 +966,7 @@ _dir$ {
 *** unclassified ***
     ?     $commands_for_ml_admin_cgi
     ?     $file_default_mode
+          $isolated_queue_expire_limit
     ?     $language_preference_order
     ?     $unsafe_header_fields
 </screen>
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index 3e05816c..6629eea0 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -324,9 +324,9 @@ article_post_restrictions</entry>
 <entry>
  restrictions for post</entry>
 <entry>
-reject_system_special_accounts
+isolate_system_special_accounts
    permit_member_maps
-   reject
+   isolate
    </entry>
 </row>
 <row>
@@ -709,10 +709,10 @@ command_mail_restrictions</entry>
 <entry>
  restrictions for command mail</entry>
 <entry>
-reject_system_special_accounts
+isolate_system_special_accounts
    permit_anonymous_command
    permit_user_command
-   reject
+   isolate
    </entry>
 </row>
 <row>
@@ -759,36 +759,68 @@ confirm
 <entry>
 createonpost_newml_maps</entry>
 <entry>
- Who is allowed to create a newml dynamically by remote.</entry>
+ restrict "who can create a new ML". PCRE is available.</entry>
 <entry>
-pcre:$ml_home_dir/newml.pcre
+pcre:$ml_home_dir/newml.allow.pcre
    </entry>
 </row>
 <row>
 <entry>
 createonpost_newml_restrictions</entry>
 <entry>
- Who is allowed to create a newml dynamically by remote.</entry>
+ Who can create a new CREATE-ON-POST ML ?</entry>
 <entry>
-permit_ml_domain
+reject_system_special_accounts
+   reject_errormail
+   reject_fml8_managed_address
+   reject_createonpost_domain
+   permit_createonpost_maintainer_maps
+   permit_ml_domain
    </entry>
 </row>
 <row>
 <entry>
 createonpost_sender_maps</entry>
 <entry>
- </entry>
+ restrict "who can post". PCRE is available.</entry>
+<entry>
+pcre:$ml_home_dir/sender.allow.pcre
+   </entry>
+</row>
+<row>
+<entry>
+createonpost_sender_restrictions</entry>
 <entry>
-pcre:$ml_home_dir/sender.pcre
+ who can post for CREATE-ON-POST ML ?</entry>
+<entry>
+reject_system_special_accounts
+   reject_errormail
+   reject_list_header_field
+   reject_fml8_managed_address
+   reject_createonpost_domain
+   permit_anyone
    </entry>
 </row>
 <row>
 <entry>
 createonpost_subscribe_maps</entry>
 <entry>
- </entry>
+ restrict "who can subscribe". PCRE is available.</entry>
+<entry>
+pcre:$ml_home_dir/subscribe.allow.pcre
+   </entry>
+</row>
+<row>
+<entry>
+createonpost_subscribe_restrictions</entry>
+<entry>
+ who can subscribe ? </entry>
 <entry>
-pcre:$ml_home_dir/subscribe.pcre
+reject_system_special_accounts
+   reject_errormail
+   reject_fml8_managed_address
+   reject_createonpost_domain
+   permit_anyone
    </entry>
 </row>
 <row>
@@ -1274,6 +1306,24 @@ check_message_id
 </row>
 <row>
 <entry>
+isolated_queue_dir</entry>
+<entry>
+ top level directory to hold isolated messages</entry>
+<entry>
+$var_dir/mail/queue-isolated
+   </entry>
+</row>
+<row>
+<entry>
+isolated_queue_expire_limit</entry>
+<entry>
+ expire messages in the queue after this limit.</entry>
+<entry>
+14d
+   </entry>
+</row>
+<row>
+<entry>
 ldap_base_dn</entry>
 <entry>
  base DN to contact in modify, search et.al.</entry>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index bc877a84..1c7f5a51 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -951,6 +951,7 @@ _dir$ {
           $db_dir
           $etc_dir
           $event_queue_dir
+          $isolated_queue_dir
           $listinfo_base_dir
           $listinfo_dir
           $listinfo_template_dir
@@ -965,6 +966,7 @@ _dir$ {
 *** unclassified ***
     ?     $commands_for_ml_admin_cgi
     ?     $file_default_mode
+          $isolated_queue_expire_limit
     ?     $language_preference_order
     ?     $unsafe_header_fields
 </screen>
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 48524b1a..2b8a854d 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -325,9 +325,9 @@ article_post_restrictions</entry>
 <entry>
  投稿への制限</entry>
 <entry>
-reject_system_special_accounts
+isolate_system_special_accounts
    permit_member_maps
-   reject
+   isolate
    </entry>
 </row>
 <row>
@@ -692,10 +692,10 @@ command_mail_restrictions</entry>
 <entry>
  コマンドへの制限</entry>
 <entry>
-reject_system_special_accounts
+isolate_system_special_accounts
    permit_anonymous_command
    permit_user_command
-   reject
+   isolate
    </entry>
 </row>
 <row>
@@ -744,7 +744,7 @@ createonpost_newml_maps</entry>
 <entry>
  CREATE-ON-POST で動的にＭＬを作ることができるユーザのリスト。</entry>
 <entry>
-pcre:$ml_home_dir/newml.pcre
+pcre:$ml_home_dir/newml.allow.pcre
    </entry>
 </row>
 <row>
@@ -753,25 +753,39 @@ createonpost_newml_restrictions</entry>
 <entry>
  CREATE-ON-POST で動的にＭＬを作ることができるユーザ</entry>
 <entry>
-permit_ml_domain
+reject_system_special_accounts
+   reject_errormail
+   reject_fml8_managed_address
+   reject_createonpost_domain
+   permit_createonpost_maintainer_maps
+   permit_ml_domain
    </entry>
 </row>
 <row>
 <entry>
-createonpost_sender_maps</entry>
+createonpost_sender_restrictions</entry>
 <entry>
- </entry>
+ CREATE-ON-POST なＭＬへ投稿できる人は誰か？</entry>
 <entry>
-pcre:$ml_home_dir/sender.pcre
+reject_system_special_accounts
+   reject_errormail
+   reject_list_header_field
+   reject_fml8_managed_address
+   reject_createonpost_domain
+   permit_anyone
    </entry>
 </row>
 <row>
 <entry>
-createonpost_subscribe_maps</entry>
+createonpost_subscribe_restrictions</entry>
 <entry>
- </entry>
+ REATE-ON-POST なＭＬへ subscribe できる人は誰か？</entry>
 <entry>
-pcre:$ml_home_dir/subscribe.pcre
+reject_system_special_accounts
+   reject_errormail
+   reject_fml8_managed_address
+   reject_createonpost_domain
+   permit_anyone
    </entry>
 </row>
 <row>
@@ -1257,6 +1271,24 @@ check_message_id
 </row>
 <row>
 <entry>
+isolated_queue_dir</entry>
+<entry>
+ top level directory to hold isolated messages</entry>
+<entry>
+$var_dir/mail/queue-isolated
+   </entry>
+</row>
+<row>
+<entry>
+isolated_queue_expire_limit</entry>
+<entry>
+ expire messages in the queue after this limit.</entry>
+<entry>
+14d
+   </entry>
+</row>
+<row>
+<entry>
 language_preference_order</entry>
 <entry>
  言語の優先順位</entry>