change $log_command_tail_starting_location default value.

rename $reply_message_ -> $report_mail_

6 files changed, 59 insertions, 28 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index 37deea26..acd8b658 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -174,6 +174,13 @@ get_command {
    }
 }
 
+log_command {
+
+   log_command { 
+    ?     $log_command_tail_starting_location
+   }
+}
+
 newml_command {
 
    newml_command { 
@@ -373,6 +380,9 @@ log {
           $use_log
    }
 
+   log_command { 
+   }
+
    log_computer_output { 
     ?     $log_computer_output_engine
           $use_log_computer_output
@@ -548,16 +558,16 @@ recipient {
 }
 
 reply_message {
-
-   reply_message_* {
-    ?     $reply_message_charset_en
-    ?     $reply_message_charset_ja
-    ?     $reply_message_default_charset
-    ?     $reply_message_subject
-   }
 }
 
 report_mail {
+
+   report_mail_* {
+    ?     $report_mail_charset_en
+    ?     $report_mail_charset_ja
+    ?     $report_mail_default_charset
+    ?     $report_mail_subject
+   }
 }
 
 sendmail {
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index 3a8e2357..bf43e0a6 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -869,6 +869,15 @@ flock
 </row>
 <row>
 <entry>
+log_command_tail_starting_location</entry>
+<entry>
+ show the last N lines of log file where N == 100.</entry>
+<entry>
+100
+   </entry>
+</row>
+<row>
+<entry>
 log_computer_output_engine</entry>
 <entry>
  specify perl module for output engine.</entry>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index cb1d9a83..0b0530d34 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -582,16 +582,16 @@ recipient {
 }
 
 reply_message {
-
-   reply_message_* {
-    ?     $reply_message_charset_en
-    ?     $reply_message_charset_ja
-    ?     $reply_message_default_charset
-    ?     $reply_message_subject
-   }
 }
 
 report_mail {
+
+   report_mail_* {
+    ?     $report_mail_charset_en
+    ?     $report_mail_charset_ja
+    ?     $report_mail_default_charset
+    ?     $report_mail_subject
+   }
 }
 
 sendmail {
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 79fb0ae8..a02a6a7c 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -872,9 +872,9 @@ flock
 <entry>
 log_command_tail_starting_location</entry>
 <entry>
- 最後の何行を表示するか？つまり tail -30 log の 30 の部分。</entry>
+ 最後の何行を表示するか？つまり tail -100 log の 100 の部分。</entry>
 <entry>
-30
+100
    </entry>
 </row>
 <row>
diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 96999639..b0c88b4c 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -684,19 +684,19 @@ language_preference_order	=	en ja
 #      History:
 #        Value:
 #     Examples:
-reply_message_default_charset	=	$reply_message_charset_en
+report_mail_default_charset	=	$report_mail_charset_en
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-reply_message_charset_ja	=	iso-2022-jp
+report_mail_charset_ja	=	iso-2022-jp
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-reply_message_charset_en	=	us-ascii
+report_mail_charset_en	=	us-ascii
 
 # Descriptions:
 #      History:
@@ -734,7 +734,7 @@ message_default_subject	=	fml system message ($ml_name ML)
 #      History:
 #        Value:
 #     Examples:
-reply_message_subject	=	fml results ($ml_name ML)
+report_mail_subject	=	fml results ($ml_name ML)
 
 
 =head2 template files
@@ -1621,6 +1621,17 @@ command_mail_filter_reject_notice_recipients	=	maintainer
 #     Examples: string
 command_mail_filter_reject_notice_data_type	=	string
 
+
+=head2	log command
+
+
+# Descriptions: show the last N lines of log file where N == 100.
+#      History: $ADMIN_LOG_DEFAULT_LINE_LIMIT
+#        Value: NUM
+#     Examples: 100
+log_command_tail_starting_location	=	100
+
+
 =head1	error message analyzer
 
 =head2
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 0d20ca14..62f35aac 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -717,19 +717,19 @@ language_preference_order	=	ja en
 #      History:
 #        Value:
 #     Examples:
-reply_message_default_charset	=	$reply_message_charset_ja
+report_mail_default_charset	=	$report_mail_charset_ja
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-reply_message_charset_ja	=	iso-2022-jp
+report_mail_charset_ja	=	iso-2022-jp
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-reply_message_charset_en	=	us-ascii
+report_mail_charset_en	=	us-ascii
 
 # Descriptions:
 #      History:
@@ -767,7 +767,7 @@ message_default_subject	=	fml system message ($ml_name ML)
 #      History:
 #        Value:
 #     Examples:
-reply_message_subject	=	fml results ($ml_name ML)
+report_mail_subject	=	fml results ($ml_name ML)
 
 
 =head2 テンプレートファイル群
@@ -1702,11 +1702,12 @@ newml_command_ml_admin_default_address 	=	$fml_owner
 list_command_default_maps		=	$recipient_maps
 
 
-# Descriptions: 最後の何行を表示するか？つまり tail -30 log の 30 の部分。
-#      History: none
+# Descriptions: 最後の何行を表示するか？つまり tail -100 log の 100 の部分。
+#      History: $ADMIN_LOG_DEFAULT_LINE_LIMIT
 #        Value: NUM
-#     Examples: 30
-log_command_tail_starting_location	=	30
+#     Examples: 100
+log_command_tail_starting_location	=	100
+
 
 =head1	エラーメール解析