summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2008-08-02 21:19:43 +0000
committerfukachan <fukachan>2008-08-02 21:19:43 +0000
commit6ffe7d86dcf33844c21a27d2edefdd2a90b59059 (patch)
tree89d3dd95b6637fb12988540acac4fc5d1f81b7ae
parent1daea8f73f0183a65b36705bd3405b090dda0a02 (diff)
downloadfml8-6ffe7d86dcf33844c21a27d2edefdd2a90b59059.tar.gz
fml8-6ffe7d86dcf33844c21a27d2edefdd2a90b59059.tar.bz2
fml8-6ffe7d86dcf33844c21a27d2edefdd2a90b59059.zip
regen: support isolate_* and set it by default in article_post_restrictions and command_mail_restriction
-rw-r--r--fml/etc/default_config.cf.en.in17
-rw-r--r--fml/etc/default_config.cf.ja.in17
2 files changed, 26 insertions, 8 deletions
diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 1a4bf041..19292b2d 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -341,13 +341,16 @@ address_compare_function_domain_matching_level = 3
# reject_system_special_accounts
# reject_spammer_maps
# reject
+# isolate_system_special_accounts
+# isolate_spammer_maps
+# isolate
# ignore_invalid_request
# ignore
# )
# Examples:
-article_post_restrictions = reject_system_special_accounts
+article_post_restrictions = isolate_system_special_accounts
permit_member_maps
- reject
+ isolate
# Descriptions: restrictions for command mail
# History: fml 4.0's PERMIT_COMMAND_FROM + REJECT_ADDR
@@ -360,14 +363,17 @@ article_post_restrictions = reject_system_special_accounts
# reject_system_special_accounts
# reject_spammer_maps
# reject
+# isolate_system_special_accounts
+# isolate_spammer_maps
+# isolate
# ignore_invalid_request
# ignore
# )
# Examples:
-command_mail_restrictions = reject_system_special_accounts
+command_mail_restrictions = isolate_system_special_accounts
permit_anonymous_command
permit_user_command
- reject
+ isolate
# Descriptions: restrictions for admin command mail
@@ -380,6 +386,9 @@ command_mail_restrictions = reject_system_special_accounts
# reject_system_special_accounts
# reject_spammer_maps
# reject
+# isolate_system_special_accounts
+# isolate_spammer_maps
+# isolate
# )
# Examples:
# 1. if auth by members-admin only
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 010e4dc6..8e946f0d 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -351,13 +351,16 @@ address_compare_function_domain_matching_level = 3
# reject_system_special_accounts
# reject_spammer_maps
# reject
+# isolate_system_special_accounts
+# isolate_spammer_maps
+# isolate
# ignore_invalid_request
# ignore
# )
# Examples:
-article_post_restrictions = reject_system_special_accounts
+article_post_restrictions = isolate_system_special_accounts
permit_member_maps
- reject
+ isolate
# Descriptions: コマンドへの制限
# History: fml 4.0 の PERMIT_COMMAND_FROM と REJECT_ADDR を合体したもの
@@ -370,14 +373,17 @@ article_post_restrictions = reject_system_special_accounts
# reject_system_special_accounts
# reject_spammer_maps
# reject
+# isolate_system_special_accounts
+# isolate_spammer_maps
+# isolate
# ignore_invalid_request
# ignore
# )
# Examples:
-command_mail_restrictions = reject_system_special_accounts
+command_mail_restrictions = isolate_system_special_accounts
permit_anonymous_command
permit_user_command
- reject
+ isolate
# Descriptions: admin コマンドへの制限
@@ -390,6 +396,9 @@ command_mail_restrictions = reject_system_special_accounts
# reject_system_special_accounts
# reject_spammer_maps
# reject
+# reject_system_special_accounts
+# reject_spammer_maps
+# reject
# )
# Examples:
# 1. members-admin だけで認証する