Prechádzať zdrojové kódy

fix cronjob, polish config

Ralf S. Engelschall 23 rokov pred
rodič
commit
4d7562e136
3 zmenil súbory, kde vykonal 18 pridanie a 18 odobranie
  1. 16 15
      lmtp2nntp/lmtp2nntp.conf
  2. 1 1
      lmtp2nntp/lmtp2nntp.spec
  3. 1 2
      lmtp2nntp/rc.lmtp2nntp

+ 16 - 15
lmtp2nntp/lmtp2nntp.conf

@@ -2,33 +2,34 @@
 ##  lmtp2nntp.conf
 ##
 
+#   PID, socket and logging file
 pidfile         '@l_prefix@/var/lmtp2nntp/lmtp2nntp.pid'
 bind            '@l_prefix@/var/lmtp2nntp/lmtp2nntp.socket'
 l2spec          ' \
                 info: prefix(prefix="%%b %%d %%H:%%M:%%S <%%L> lmtp2nntp[%%P]: ",timezone=local) \
-                -> file(path="@l_prefix@/var/lmtp2nntp/lmtp2nntp.log",append=0,perm=432) \
+                -> file(path="@l_prefix@/var/lmtp2nntp/lmtp2nntp.log",append=0,perm=0644) \
                 '
-#user            @l_musr@ #FIXME
+
+#   run-time parameters
+#user           @l_musr@
 destination     news
 groupmode       envelope
 operationmode   post
 newsgroup       *
 
-        ### CRUCIAL GATEWAY HEADER REWRITE RULES ###
-
-# remove headers
-headerrule '500:^(-EF|Path|Received|To|Cc|Bcc|):$1:'
+# header rewriting: remove headers
+headerrule      '500:^(-EF|Path|Received|To|Cc|Bcc|):$1:'
 
-# merge values from duplicate headers and separte them with "comma space"
-headerrule '510:^(Reply-To):$1:[${msg.header.${1}[#]}${msg.header.${1}[#+1]:+, }]'
+# header rewriting: merge values from duplicate headers and separte them with "comma space"
+headerrule      '510:^(Reply-To):$1:[${msg.header.${1}[#]}${msg.header.${1}[#+1]:+, }]'
 
-# replace empty Subject with text "None"
-headerrule '520::Subject:${msg.header.Subject:-None}'
+# header rewriting: replace empty Subject with text "None"
+headerrule      '520::Subject:${msg.header.Subject:-None}'
 
-# create Message-ID if omitted or illegal (no or more than one '@')
-headerrule '530::Message-ID:${msg.header.Message-ID:-@@:s/^.*@.*@.*$//:%createmessageid}'
+# header rewriting: create Message-ID if omitted or illegal (no or more than one '@')
+headerrule      '530::Message-ID:${msg.header.Message-ID:-@@:s/^.*@.*@.*$//:%createmessageid}'
 
-# append a header
-headerrule '540::Path:lmtp2nntp!not-for-mail'
-headerrule '550::X-Gateway:lmtp2nntp'
+# header rewriting: append a header
+headerrule      '540::Path:lmtp2nntp!not-for-mail'
+headerrule      '550::X-Gateway:lmtp2nntp'
 

+ 1 - 1
lmtp2nntp/lmtp2nntp.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      GPL
 Version:      1.2a6
-Release:      20021128
+Release:      20021217
 
 #   list of sources
 Source0:      ftp://ftp.ossp.org/pkg/tool/lmtp2nntp/lmtp2nntp-%{version}.tar.gz

+ 1 - 2
lmtp2nntp/rc.lmtp2nntp

@@ -6,7 +6,6 @@
 %config
     #   public (user-adjustable) options
     lmtp2nntp_enable="yes"
-
     lmtp2nntp_log_level="info"
     lmtp2nntp_log_prolog="true"
     lmtp2nntp_log_epilog="true"
@@ -52,7 +51,7 @@
         -n ${lmtp2nntp_log_numfiles} -s ${lmtp2nntp_log_minsize} -d \
         -z ${lmtp2nntp_log_complevel} -o @l_musr@ -o @l_mgrp@ -m 644 \
         -P "$lmtp2nntp_log_prolog" -E "$lmtp2nntp_log_epilog" \
-        $lmtp2nntp_logfile
+        @l_prefix@/var/lmtp2nntp/lmtp2nntp.log
     if [ ".`cat $hintfile`" = ".epilog" ]; then
         $cmd_stop
         sleep 1