regen: create-on-post configurations revised

2 files changed, 202 insertions, 69 deletions

diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 19292b2d..38ebb59c 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -3100,7 +3100,11 @@ moderate_queue_expire_limit	=	14d
 use_createonpost_function	=	yes
 
 
-# Descriptions:
+=head2 CREATE-ON-POST who can post ?
+
+
+# Descriptions: who can post for CREATE-ON-POST ML ?
+#		anyone by default.
 #      History: NONE
 #        Value: MIX (
 #			reject_errormail
@@ -3113,13 +3117,27 @@ use_createonpost_function	=	yes
 #               )
 #     Examples: permit_anyone
 createonpost_sender_restrictions =	reject_system_special_accounts
-					reject_errormail	
+					reject_errormail
 					reject_list_header_field
 					reject_fml8_managed_address
 					reject_createonpost_domain
 					permit_anyone
 
-# Descriptions:
+
+# Descriptions: restrict "who can post". PCRE is available.
+#               e.g. \S+\@example.com
+#      History: NONE
+#        Value: FILE
+#     Examples: pcre:$ml_home_dir/sender.allow.pcre
+createonpost_sender_maps	=	pcre:$ml_home_dir/sender.allow.pcre
+
+
+
+=head2 CREATE-ON-POST で subscribe 可能な人
+
+
+# Descriptions: who can subscribe ? 
+#		anyone by default.
 #      History: NONE
 #        Value: MIX (
 #			reject_errormail
@@ -3136,50 +3154,98 @@ createonpost_subscribe_restrictions =	reject_system_special_accounts
  					permit_anyone
 
 
-# Descriptions: 
-#               For eaxmple, this file contains \S+\@example.com line.
+# Descriptions: restrict "who can subscribe". PCRE is available.
+#               e.g. \S+\@example.com
 #      History: NONE
 #        Value: FILE
-#     Examples:
-createonpost_sender_maps	=	pcre:$ml_home_dir/sender.pcre
+#     Examples: pcre:$ml_home_dir/subscribe.allow.pcre
+createonpost_subscribe_maps	=	pcre:$ml_home_dir/subscribe.allow.pcre
 
 
-# Descriptions: 
-#               For eaxmple, this file contains \S+\@example.com line.
-#      History: NONE
-#        Value: FILE
-#     Examples:
-createonpost_subscribe_maps	=	pcre:$ml_home_dir/subscribe.pcre
-
-
-=head2 CREATE-ON-POST NEWML RESTRICTIONS
+=head2 CREATE-ON-POST who can create a new create-on-post ML ?
 
 
-# Descriptions: Who is allowed to create a newml dynamically by remote.
-#               Anyone can do this by default at the first design,
-#               but it is inappropriate in the actual operation.
-#               If you restricts the permission more granually, 
-#               use $createonpost_newml_maps, which allows regexp. 
-#      History: fml4 has no CREATE-ON-POST function.
-#		In the first implementation of CREATE-ON-POST of fml8, 
-#		this restriction is not implemented. So, 
-#		it was "permit_anyone" in creating a new ML.
+# Descriptions: Who can create a new CREATE-ON-POST ML ?
+#		user@$ml_domain is allowed by default.
+#		It is recommended that you should use $createonpost_newml_maps
+#		to control senders more granually.
+#      History: fml4 has no such function.
+#		fml8 before 2008/07 does not have this rectrictions.
+#		It means permit_anyone.
+#		Default action is changed to permit_ml_domain at 2008/07.
 #        Value: MIX (
+#			reject_errormail
+#			reject_fml8_managed_address
+#			reject_createonpost_domain
+#			permit_createonpost_maintainer_maps
+#			permit_createonpost_newml_maps
 #			permit_createonpost_newml_maps
 #			permit_ml_domain
 #			permit_anyone
-#		)
-#     Examples: permit_ml_domain
-createonpost_newml_restrictions = permit_ml_domain
+#               )
+#     Examples: permit_anyone
+createonpost_newml_restrictions =	reject_system_special_accounts
+					reject_errormail
+					reject_fml8_managed_address
+					reject_createonpost_domain
+					permit_createonpost_maintainer_maps
+ 					permit_ml_domain
 
 
-# Descriptions: Who is allowed to create a newml dynamically by remote.
-#               You can use perl regular expressions.
-#               For eaxmple, this file contains \S+\@example.com line.
+# Descriptions: restrict "who can create a new ML". PCRE is available.
+#               e.g. \S+\@example.com
 #      History: NONE
 #        Value: FILE
-#     Examples: pcre:$ml_home_dir/newml.pcre
-createonpost_newml_maps	=	pcre:$ml_home_dir/newml.pcre
+#     Examples: pcre:$ml_home_dir/newml.allow.pcre
+createonpost_newml_maps	=	pcre:$ml_home_dir/newml.allow.pcre
+
+
+
+=head1	send information or confirm periodically
+
+
+# Descriptions: enable remind process or not
+#      History: none
+#        Value: YES_OR_NO
+#     Examples: yes
+use_remind_function		=	yes
+
+
+# Descriptions: confirm he/she keeps to subscribe this list periodically. 
+#      History: none
+#        Value: YES_OR_NO
+#     Examples: no
+use_remind_keep_subscribed_function       =	no
+
+
+# Descriptions: how often should we confirm ?
+#      History: $CONFIRMD_ACK_EXPIRE_UNIT
+#        Value: DATE
+#     Examples: 90d
+remind_keep_subscribed_interval  =	90d
+
+
+# Descriptions: how much should we wait for the query ?
+#		If no reply after this period, remove the user.
+#      History: $CONFIRMD_ACK_WAIT_UNIT
+#        Value: DATE
+#     Examples: 14d
+remind_keep_subscribed_wait_reply_interval  =	14d
+
+
+# Descriptions: inform ML usage periodically ?
+#      History: none
+#        Value: YES_OR_NO
+#     Examples: no
+use_remind_usage_funtion	=	no
+
+
+# Descriptions: how often we inform ML usage ?
+#      History: none
+#        Value: DATE
+#     Examples: 90d
+remind_usage_interval           =	90d
+
 
 
 =head1 program paths
@@ -4003,4 +4069,12 @@ ldap_query_find_search_filter		=	(&(objectclass=*)(ou=$ml_name@$ml_domain))
 # $makefml_run_start_hook = q{ 1;};
 # $makefml_verify_request_end_hook = q{ 1;};
 # $makefml_verify_request_start_hook = q{ 1;};
+# $remind_finish_end_hook = q{ 1;};
+# $remind_finish_start_hook = q{ 1;};
+# $remind_prepare_end_hook = q{ 1;};
+# $remind_prepare_start_hook = q{ 1;};
+# $remind_run_end_hook = q{ 1;};
+# $remind_run_start_hook = q{ 1;};
+# $remind_verify_request_end_hook = q{ 1;};
+# $remind_verify_request_start_hook = q{ 1;};
 
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 8e946f0d..521c26b5 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -3173,6 +3173,7 @@ moderate_queue_expire_limit	=	14d
 
 =head1 CREATE-ON-POST
 
+
 # Descriptions: CREATE-ON-POST 機能を使うか否か？
 #               なお、この変数は createonpost プログラムでのみ意味がある。
 #      History: NONE
@@ -3181,7 +3182,11 @@ moderate_queue_expire_limit	=	14d
 use_createonpost_function	=	yes
 
 
-# Descriptions:
+=head2 CREATE-ON-POST で投稿可能な人
+
+
+# Descriptions: CREATE-ON-POST なＭＬへ投稿できる人は誰か？
+#		デフォルトはループを防ぐための例外を除き「誰でも投稿可」
 #      History: NONE
 #        Value: MIX (
 #			reject_errormail
@@ -3200,58 +3205,46 @@ createonpost_sender_restrictions =	reject_system_special_accounts
 					reject_createonpost_domain
 					permit_anyone
 
+
 # Descriptions:
+#               ファイルの中は、たとえば \S+\@example.com
 #      History: NONE
-#        Value: MIX (
-#			reject_errormail
-#			reject_fml8_managed_address
-#			reject_createonpost_domain
-#			permit_createonpost_subscribe_maps
-#			permit_anyone
-#               )
-#     Examples: permit_anyone
-createonpost_subscribe_restrictions =	reject_system_special_accounts
-					reject_errormail
-					reject_fml8_managed_address
-					reject_createonpost_domain
- 					permit_anyone
+#        Value: FILE
+#     Examples: pcre:$ml_home_dir/sender.allow.pcre
+createonpost_sender_maps	=	pcre:$ml_home_dir/sender.allow.pcre
 
 
-# Descriptions:
+
+=head2 CREATE-ON-POST で subscribe 可能な人
+
+
+# Descriptions: REATE-ON-POST なＭＬへ subscribe できる人は誰か？
+#		デフォルトはループを防ぐための例外を除き「誰でも可」
 #      History: NONE
 #        Value: MIX (
 #			reject_errormail
 #			reject_fml8_managed_address
 #			reject_createonpost_domain
-#			permit_createonpost_maintainer_maps
+#			permit_createonpost_subscribe_maps
 #			permit_anyone
 #               )
 #     Examples: permit_anyone
-createonpost_newml_restrictions =	reject_system_special_accounts
+createonpost_subscribe_restrictions =	reject_system_special_accounts
 					reject_errormail
 					reject_fml8_managed_address
 					reject_createonpost_domain
-					permit_createonpost_maintainer_maps
  					permit_anyone
 
 
-# Descriptions: 
-#               ファイルの中は、たとえば \S+\@example.com
-#      History: NONE
-#        Value: FILE
-#     Examples:
-createonpost_sender_maps	=	pcre:$ml_home_dir/sender.pcre
-
-
-# Descriptions: 
+# Descriptions:
 #               ファイルの中は、たとえば \S+\@example.com
 #      History: NONE
 #        Value: FILE
-#     Examples:
-createonpost_subscribe_maps	=	pcre:$ml_home_dir/subscribe.pcre
+#     Examples: pcre:$ml_home_dir/subscribe.allow.pcre
+createonpost_subscribe_maps	=	pcre:$ml_home_dir/subscribe.allow.pcre
 
 
-=head2 CREATE-ON-POST でＭＬを作る機能への制限
+=head2 CREATE-ON-POST でＭＬを作成可能な人
 
 
 # Descriptions: CREATE-ON-POST で動的にＭＬを作ることができるユーザ
@@ -3263,14 +3256,24 @@ createonpost_subscribe_maps	=	pcre:$ml_home_dir/subscribe.pcre
 #               $createonpost_newml_maps でドメイン制限などを行なうと良い。
 #      History: fml4 にはない。
 #		fml8 の初期実装では、この restrictions はなく、
-#		permit_anyone と同じ意味であった。 
+#		permit_anyone と同じ意味であった。
 #        Value: MIX (
+#			reject_errormail
+#			reject_fml8_managed_address
+#			reject_createonpost_domain
+#			permit_createonpost_maintainer_maps
+#			permit_createonpost_newml_maps
 #			permit_createonpost_newml_maps
 #			permit_ml_domain
 #			permit_anyone
-#		)
-#     Examples: yes
-createonpost_newml_restrictions = permit_ml_domain
+#               )
+#     Examples: permit_anyone
+createonpost_newml_restrictions =	reject_system_special_accounts
+					reject_errormail
+					reject_fml8_managed_address
+					reject_createonpost_domain
+					permit_createonpost_maintainer_maps
+ 					permit_ml_domain
 
 
 # Descriptions: CREATE-ON-POST で動的にＭＬを作ることができるユーザのリスト。
@@ -3278,8 +3281,56 @@ createonpost_newml_restrictions = permit_ml_domain
 #               ファイルの中は、たとえば \S+\@example.com
 #      History: NONE
 #        Value: FILE
-#     Examples: pcre:$ml_home_dir/newml.pcre
-createonpost_newml_maps	=	pcre:$ml_home_dir/newml.pcre
+#     Examples: pcre:$ml_home_dir/newml.allow.pcre
+createonpost_newml_maps	=	pcre:$ml_home_dir/newml.allow.pcre
+
+
+
+=head1	定期的に情報を送る、もしくは確認する
+
+
+# Descriptions: remind プロセスを有効にするか否か
+#      History: none
+#        Value: YES_OR_NO
+#     Examples: yes
+use_remind_function		=	yes
+
+
+# Descriptions: 定期的に「subscribe し続けるか否か」を確認するか？
+#      History: none
+#        Value: YES_OR_NO
+#     Examples: no
+use_remind_keep_subscribed_function	=	no
+
+
+# Descriptions: 何日おきに「subscribe し続けるか否か」を確認するか？
+#      History: $CONFIRMD_ACK_EXPIRE_UNIT
+#        Value: DATE
+#     Examples: 90d
+remind_keep_subscribed_interval  =	90d
+
+
+# Descriptions: 確認にたいする返事をどれだけ待つか？
+# 		この期間を過ぎると該当ユーザは削除される。               
+#      History: $CONFIRMD_ACK_WAIT_UNIT
+#        Value: DATE
+#     Examples: 14d
+remind_keep_subscribed_wait_reply_interval  =	14d
+
+
+# Descriptions: ＭＬの使い方を定期的に教えるか？
+#      History: none
+#        Value: YES_OR_NO
+#     Examples: no
+use_remind_usage_function	=	no
+
+
+# Descriptions: 何日おきにＭＬの使い方を教えるか？
+#      History: none
+#        Value: DATE
+#     Examples: 90d
+remind_usage_interval           =	90d
+
 
 
 =head1 program paths
@@ -4119,4 +4170,12 @@ ldap_query_find_search_filter		=	(&(objectclass=*)(ou=$ml_name@$ml_domain))
 # $makefml_run_start_hook = q{ 1;};
 # $makefml_verify_request_end_hook = q{ 1;};
 # $makefml_verify_request_start_hook = q{ 1;};
+# $remind_finish_end_hook = q{ 1;};
+# $remind_finish_start_hook = q{ 1;};
+# $remind_prepare_end_hook = q{ 1;};
+# $remind_prepare_start_hook = q{ 1;};
+# $remind_run_end_hook = q{ 1;};
+# $remind_run_start_hook = q{ 1;};
+# $remind_verify_request_end_hook = q{ 1;};
+# $remind_verify_request_start_hook = q{ 1;};