From 6ff968265f16c78e66e717fc7f07652cb2c2e084 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Thu, 24 Jan 2002 08:32:03 +0000
Subject: [PATCH] fixed log file rotation group ownership

---
 apache/rc.apache     |  2 +-
 bind/rc.bind         |  2 +-
 pb4sd/rc.pb4sd       |  2 +-
 postfix/rc.postfix   |  2 +-
 qpopper/rc.qpopper   |  2 +-
 rsync/rc.rsyncd      | 43 +++++++++++++++++++++++++++++++++++++++++++
 smtpfeed/rc.smtpfeed |  2 +-
 7 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 rsync/rc.rsyncd

diff --git a/apache/rc.apache b/apache/rc.apache
index fa2121c50d..703fcff2ee 100644
--- a/apache/rc.apache
+++ b/apache/rc.apache
@@ -44,7 +44,7 @@
     if [ ".$apache_err_files" != . ]; then
         shtool rotate -f \
             -n${apache_err_rotsteps} -s${apache_err_rotminsize} -d \
-            -z${apache_err_rotcomplevel} -o@l_fsusr@ -o@l_fsgrp@ -m644 \
+            -z${apache_err_rotcomplevel} -o@l_fsusr@ -g@l_fsgrp@ -m644 \
             -P "$apache_err_rotprolog" \
             -E "@l_prefix@/sbin/apachectl restart; $apache_err_rotepilog" \
             $apache_err_files
diff --git a/bind/rc.bind b/bind/rc.bind
index 4c5f93cbd6..571f691c06 100644
--- a/bind/rc.bind
+++ b/bind/rc.bind
@@ -33,7 +33,7 @@
     if opServiceEnabled bind; then
         shtool rotate -f \
             -n${bind_log_numfiles} -s${bind_log_minsize} \
-            -d -z${bind_log_complevel} -o@l_fsusr@ -o@l_fsgrp@ -m644 \
+            -d -z${bind_log_complevel} -o@l_fsusr@ -g@l_fsgrp@ -m644 \
             -E '@l_prefix@/sbin/ndc restart' \
             @l_prefix@/var/bind/named.log 
     fi
diff --git a/pb4sd/rc.pb4sd b/pb4sd/rc.pb4sd
index d3ad0a7705..a744ce26b6 100644
--- a/pb4sd/rc.pb4sd
+++ b/pb4sd/rc.pb4sd
@@ -40,7 +40,7 @@
     opServiceEnabled pb4sd || exit 0
     shtool rotate -f \
         -n${pb4sd_log_numfiles} -s${pb4sd_log_minsize} -d \
-        -z${pb4sd_log_complevel} -o@l_fsusr@ -o@l_fsgrp@ -m644 \
+        -z${pb4sd_log_complevel} -o@l_fsusr@ -g@l_fsgrp@ -m644 \
         -P "${pb4sd_log_prolog}" \
         -E "${pb4sd_log_epilog}" \
         ${pb4sd_logfile}
diff --git a/postfix/rc.postfix b/postfix/rc.postfix
index 7867e058c9..4cb14264c2 100644
--- a/postfix/rc.postfix
+++ b/postfix/rc.postfix
@@ -53,7 +53,7 @@
     #   rotate logfile
     shtool rotate -f \
         -n${postfix_log_numfiles} -s${postfix_log_minsize} -d \
-        -z${postfix_log_complevel} -o@l_fsusr@ -o@l_fsgrp@ -m644 \
+        -z${postfix_log_complevel} -o@l_fsusr@ -g@l_fsgrp@ -m644 \
         -P "$postfix_log_prolog" \
         -E "@l_prefix@/sbin/postfix reload; $postfix_log_epilog" \
         @l_prefix@/var/postfix/log/postfix.log
diff --git a/qpopper/rc.qpopper b/qpopper/rc.qpopper
index a3bed9e59e..b991960540 100644
--- a/qpopper/rc.qpopper
+++ b/qpopper/rc.qpopper
@@ -37,7 +37,7 @@
     opServiceEnabled qpopper || exit 0
     shtool rotate -f \
         -n${qpopper_log_numfiles} -s${qpopper_log_minsize} -d \
-        -z${qpopper_log_complevel} -o@l_fsusr@ -o@l_fsgrp@ -m644 \
+        -z${qpopper_log_complevel} -o@l_fsusr@ -g@l_fsgrp@ -m644 \
         -P "${qpopper_log_prolog}" \
         -E "${qpopper_log_epilog}" \
         $pop_logfile
diff --git a/rsync/rc.rsyncd b/rsync/rc.rsyncd
new file mode 100644
index 0000000000..44efc483ef
--- /dev/null
+++ b/rsync/rc.rsyncd
@@ -0,0 +1,43 @@
+#!@l_prefix@/lib/rpm/bash @l_prefix@/etc/rc
+##
+##  rc.rsyncd -- Run-Commands for RSYNC Daemon
+##
+
+%config
+    rsyncd_enable="yes"
+    rsyncd_flags=""
+    rsyncd_log_numfiles="5"
+    rsyncd_log_minsize="512K"
+    rsyncd_log_complevel="9"
+
+%start -p 200 -u root
+    if opServiceEnabled rsyncd; then
+        @l_prefix@/bin/rsync $rsyncd_flags --daemon --config=@l_prefix@/etc/rsync/rsyncd.conf
+    fi
+
+%stop -p 200 -u root
+    if opServiceEnabled rsyncd; then
+        kill -TERM `cat @l_prefix@/var/rsync/rsyncd.pid`
+    fi
+
+%restart -u root
+    if opServiceEnabled rsyncd; then
+        kill -TERM `cat @l_prefix@/var/rsync/rsyncd.pid`
+        sleep 2
+        @l_prefix@/bin/rsync $rsyncd_flags --daemon --config=@l_prefix@/etc/rsync/rsyncd.conf
+    fi
+
+%reload -u root
+    if opServiceEnabled rsyncd; then
+        kill -HUP `cat @l_prefix@/var/rsync/rsyncd.pid`
+    fi
+
+%daily -u root
+    if opServiceEnabled rsyncd; then
+        shtool rotate -f \
+            -n${rsyncd_log_numfiles} -s${rsyncd_log_minsize} \
+            -d -z${rsyncd_log_complevel} -o@l_fsusr@ -g@l_fsgrp@ -m644 \
+            -E "kill -HUP `cat @l_prefix@/var/rsync/rsyncd.pid`" \
+            @l_prefix@/var/rsync/rsyncd.log 
+    fi
+
diff --git a/smtpfeed/rc.smtpfeed b/smtpfeed/rc.smtpfeed
index ef7d52255a..d6b7417032 100644
--- a/smtpfeed/rc.smtpfeed
+++ b/smtpfeed/rc.smtpfeed
@@ -62,7 +62,7 @@
     opServiceEnabled smtpfeed || exit 0
     shtool rotate -f \
         -n${smtpfeed_log_numfiles} -s${smtpfeed_log_minsize} -d \
-        -z${smtpfeed_log_complevel} -o@l_fsusr@ -o@l_fsgrp@ -m644 \
+        -z${smtpfeed_log_complevel} -o@l_fsusr@ -g@l_fsgrp@ -m644 \
         -P "$smtpfeed_log_prolog" \
         -E "$smtpfeed_log_epilog" \
         @l_prefix@/var/smtpfeed/smtpfeed.log