OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Jun-2003 14:17:42
Branch: HEAD Handle: 2003062413173506
Modified files:
openpkg-src/exim rc.exim
openpkg-src/gated rc.gated
openpkg-src/inn rc.inn
openpkg-src/ircd rc.ircd
openpkg-src/perforce rc.perforce
openpkg-src/portfwd rc.portfwd
openpkg-src/pound rc.pound
openpkg-src/pureftpd rc.pureftpd
openpkg-src/qpopper rc.qpopper
openpkg-src/radius rc.radius
openpkg-src/samba rc.samba
openpkg-src/samhain rc.samhain
openpkg-src/smtpfeed rc.smtpfeed
openpkg-src/spegla rc.spegla
openpkg-src/squid rc.squid
Log:
replace root constant with l_susr variable in rc files
Summary:
Revision Changes Path
1.5 +5 -5 openpkg-src/exim/rc.exim
1.5 +3 -3 openpkg-src/gated/rc.gated
1.8 +1 -1 openpkg-src/inn/rc.inn
1.5 +4 -4 openpkg-src/ircd/rc.ircd
1.3 +2 -2 openpkg-src/perforce/rc.perforce
1.3 +2 -2 openpkg-src/portfwd/rc.portfwd
1.3 +2 -2 openpkg-src/pound/rc.pound
1.5 +3 -3 openpkg-src/pureftpd/rc.pureftpd
1.11 +4 -4 openpkg-src/qpopper/rc.qpopper
1.3 +2 -2 openpkg-src/radius/rc.radius
1.7 +3 -3 openpkg-src/samba/rc.samba
1.6 +2 -2 openpkg-src/samhain/rc.samhain
1.10 +4 -4 openpkg-src/smtpfeed/rc.smtpfeed
1.3 +1 -1 openpkg-src/spegla/rc.spegla
1.6 +4 -4 openpkg-src/squid/rc.squid
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/exim/rc.exim
============================================================================
$ cvs diff -u -r1.4 -r1.5 rc.exim
--- openpkg-src/exim/rc.exim 24 Jun 2003 12:07:44 -0000 1.4
+++ openpkg-src/exim/rc.exim 24 Jun 2003 12:17:35 -0000 1.5
@@ -10,18 +10,18 @@
exim_enable="yes"
exim_flags="-bd -q30m"
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
opServiceEnabled exim || exit 0
@l_prefix@/sbin/exim ${exim_flags}
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
opServiceEnabled exim || exit 0
for pidfile in @l_prefix@/var/exim/run/*.pid; do
[ ".$pidfile" = "[EMAIL PROTECTED]@/var/exim/run/*.pid" ] && break
kill -TERM `cat $pidfile`
done
-%restart -u root
+%restart -u @l_susr@
opServiceEnabled exim || exit 0
for pidfile in @l_prefix@/var/exim/run/*.pid; do
[ ".$pidfile" = "[EMAIL PROTECTED]@/var/exim/run/*.pid" ] && break
@@ -30,13 +30,13 @@
sleep 1
@l_prefix@/sbin/exim ${exim_flags}
-%reload -u root
+%reload -u @l_susr@
opServiceEnabled exim || exit 0
for pidfile in @l_prefix@/var/exim/run/*.pid; do
[ ".$pidfile" = "[EMAIL PROTECTED]@/var/exim/run/*.pid" ] && break
kill -HUP `cat $pidfile`
done
-%daily -u root
+%daily -u @l_susr@
opServiceEnabled exim || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gated/rc.gated
============================================================================
$ cvs diff -u -r1.4 -r1.5 rc.gated
--- openpkg-src/gated/rc.gated 24 Jun 2003 12:07:45 -0000 1.4
+++ openpkg-src/gated/rc.gated 24 Jun 2003 12:17:35 -0000 1.5
@@ -6,15 +6,15 @@
%config
gated_enable="yes"
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
opServiceEnabled gated || exit 0
@l_prefix@/sbin/gdc start
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
opServiceEnabled gated || exit 0
@l_prefix@/sbin/gdc stop
-%restart -u root
+%restart -u @l_susr@
opServiceEnabled gated || exit 0
@l_prefix@/sbin/gdc restart
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/inn/rc.inn
============================================================================
$ cvs diff -u -r1.7 -r1.8 rc.inn
--- openpkg-src/inn/rc.inn 24 Jun 2003 12:07:48 -0000 1.7
+++ openpkg-src/inn/rc.inn 24 Jun 2003 12:17:36 -0000 1.8
@@ -38,7 +38,7 @@
-z${inn_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
-P "${inn_log_prolog}" \
-E "${inn_log_epilog}" \
- @l_prefix@/var/FOO/log/*.log
+ @l_prefix@/var/inn/log/*.log
%quarterly -u @l_rusr@
opServiceEnabled inn || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ircd/rc.ircd
============================================================================
$ cvs diff -u -r1.4 -r1.5 rc.ircd
--- openpkg-src/ircd/rc.ircd 24 Jun 2003 12:07:48 -0000 1.4
+++ openpkg-src/ircd/rc.ircd 24 Jun 2003 12:17:36 -0000 1.5
@@ -6,21 +6,21 @@
%config
ircd_enable="yes"
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
opServiceEnabled ircd || exit 0
@l_prefix@/sbin/ircd
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
opServiceEnabled ircd || exit 0
kill -TERM `cat @l_prefix@/var/ircd/ircd.pid`
-%restart -u root
+%restart -u @l_susr@
opServiceEnabled ircd || exit 0
kill -TERM `cat @l_prefix@/var/ircd/ircd.pid`
sleep 2
@l_prefix@/sbin/ircd
-%reload -u root
+%reload -u @l_susr@
opServiceEnabled ircd || exit 0
kill -HUP `cat @l_prefix@/var/ircd/ircd.pid`
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perforce/rc.perforce
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.perforce
--- openpkg-src/perforce/rc.perforce 24 Jun 2003 12:07:58 -0000 1.2
+++ openpkg-src/perforce/rc.perforce 24 Jun 2003 12:17:37 -0000 1.3
@@ -10,7 +10,7 @@
perforce_journal="@l_prefix@/var/perforce/p4d.journal"
perforce_logfile="@l_prefix@/var/perforce/p4d.log"
-%start -p 100 -u root
+%start -p 100 -u @l_susr@
if opServiceEnabled perforce; then
cmd="@l_prefix@/sbin/p4d"
cmd="$cmd -q -d -z"
@@ -22,7 +22,7 @@
su @l_rusr@ -c "nohup $cmd </dev/null >/dev/null 2>&1 &"
fi
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
if opServiceEnabled perforce; then
cmd="@l_prefix@/bin/p4"
cmd="$cmd -p ${perforce_port}"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/portfwd/rc.portfwd
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.portfwd
--- openpkg-src/portfwd/rc.portfwd 24 Jun 2003 12:07:59 -0000 1.2
+++ openpkg-src/portfwd/rc.portfwd 24 Jun 2003 12:17:37 -0000 1.3
@@ -7,12 +7,12 @@
portfwd_enable="yes"
portfwd_flags=""
-%start -p 100 -u root
+%start -p 100 -u @l_susr@
if opServiceEnabled portfwd; then
@l_prefix@/sbin/portfwd $portfwd_flags
fi
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
if opServiceEnabled portfwd; then
rpmtool signal -d 1 -m @l_prefix@/sbin/portfwd TERM KILL >/dev/null 2>&1 ||
true
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pound/rc.pound
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.pound
--- openpkg-src/pound/rc.pound 24 Jun 2003 12:08:02 -0000 1.2
+++ openpkg-src/pound/rc.pound 24 Jun 2003 12:17:38 -0000 1.3
@@ -6,12 +6,12 @@
%config
pound_enable="yes"
-%start -p 100 -u root
+%start -p 100 -u @l_susr@
if opServiceEnabled pound; then
@l_prefix@/sbin/pound
fi
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
if opServiceEnabled pound; then
kill -TERM `cat @l_prefix@/var/pound/pound.pid`
sleep 1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pureftpd/rc.pureftpd
============================================================================
$ cvs diff -u -r1.4 -r1.5 rc.pureftpd
--- openpkg-src/pureftpd/rc.pureftpd 24 Jun 2003 12:08:04 -0000 1.4
+++ openpkg-src/pureftpd/rc.pureftpd 24 Jun 2003 12:17:38 -0000 1.5
@@ -6,18 +6,18 @@
%config
pureftpd_enable="yes"
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
if opServiceEnabled pureftpd; then
@l_prefix@/sbin/pure-ftpd </dev/null &
echo "$!" >@l_prefix@/var/pureftpd/pureftpd.pid
fi
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
if opServiceEnabled pureftpd; then
kill -TERM `cat @l_prefix@/var/pureftpd/pureftpd.pid`
fi
-%restart -u root
+%restart -u @l_susr@
if opServiceEnabled pureftpd; then
kill -TERM `cat @l_prefix@/var/pureftpd/pureftpd.pid`
sleep 2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qpopper/rc.qpopper
============================================================================
$ cvs diff -u -r1.10 -r1.11 rc.qpopper
--- openpkg-src/qpopper/rc.qpopper 24 Jun 2003 12:08:04 -0000 1.10
+++ openpkg-src/qpopper/rc.qpopper 24 Jun 2003 12:17:39 -0000 1.11
@@ -14,18 +14,18 @@
pop_type="qpopper"
pop_logfile="@l_prefix@/var/qpopper/qpopper.log"
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
opServiceEnabled qpopper || exit 0
@l_prefix@/sbin/qpopper ${qpopper_bind} -S -f
@l_prefix@/etc/qpopper/qpopper.config
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
opServiceEnabled qpopper || exit 0
if [ -f @l_prefix@/var/qpopper/qpopper.pid ]; then
kill -TERM `cat @l_prefix@/var/qpopper/qpopper.pid`
rm -f @l_prefix@/var/qpopper/qpopper.pid >/dev/null 2>&1 || true
fi
-%restart -u root
+%restart -u @l_susr@
opServiceEnabled qpopper || exit 0
if [ -f @l_prefix@/var/qpopper/qpopper.pid ]; then
kill -TERM `cat @l_prefix@/var/qpopper/qpopper.pid`
@@ -34,7 +34,7 @@
fi
@l_prefix@/sbin/qpopper ${qpopper_bind} -S -f
@l_prefix@/etc/qpopper/qpopper.config
-%daily -u root
+%daily -u @l_susr@
opServiceEnabled qpopper || exit 0
shtool rotate -f \
-n${qpopper_log_numfiles} -s${qpopper_log_minsize} -d \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/radius/rc.radius
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.radius
--- openpkg-src/radius/rc.radius 24 Jun 2003 12:08:05 -0000 1.2
+++ openpkg-src/radius/rc.radius 24 Jun 2003 12:17:39 -0000 1.3
@@ -6,11 +6,11 @@
%config
radius_enable="yes"
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
opServiceEnabled radius || exit 0
@l_prefix@/sbin/radctl start
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
opServiceEnabled radius || exit 0
@l_prefix@/sbin/radctl stop
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/rc.samba
============================================================================
$ cvs diff -u -r1.6 -r1.7 rc.samba
--- openpkg-src/samba/rc.samba 24 Jun 2003 12:08:06 -0000 1.6
+++ openpkg-src/samba/rc.samba 24 Jun 2003 12:17:39 -0000 1.7
@@ -6,17 +6,17 @@
%config
samba_enable="yes"
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
opServiceEnabled samba || exit 0
@l_prefix@/sbin/smbd -D
@l_prefix@/sbin/nmbd -D
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
opServiceEnabled samba || exit 0
kill -TERM `cat @l_prefix@/var/samba/run/smbd.pid`
kill -TERM `cat @l_prefix@/var/samba/run/nmbd.pid`
-%restart -u root
+%restart -u @l_susr@
opServiceEnabled samba || exit 0
kill -TERM `cat @l_prefix@/var/samba/run/smbd.pid`
kill -TERM `cat @l_prefix@/var/samba/run/nmbd.pid`
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samhain/rc.samhain
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.samhain
--- openpkg-src/samhain/rc.samhain 24 Jun 2003 12:08:07 -0000 1.5
+++ openpkg-src/samhain/rc.samhain 24 Jun 2003 12:17:40 -0000 1.6
@@ -6,11 +6,11 @@
%config
samhain_enable="yes"
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
opServiceEnabled samhain || exit 0
@l_prefix@/sbin/samhain -t check -D
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
opServiceEnabled samhain || exit 0
if [ -f @l_prefix@/var/samhain/samhain.pid ]; then
kill -TERM `cat @l_prefix@/var/samhain/samhain.pid`
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/smtpfeed/rc.smtpfeed
============================================================================
$ cvs diff -u -r1.9 -r1.10 rc.smtpfeed
--- openpkg-src/smtpfeed/rc.smtpfeed 24 Jun 2003 12:08:08 -0000 1.9
+++ openpkg-src/smtpfeed/rc.smtpfeed 24 Jun 2003 12:17:40 -0000 1.10
@@ -44,21 +44,21 @@
fi
}
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
opServiceEnabled smtpfeed || exit 0
smtpfeed_start
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
opServiceEnabled smtpfeed || exit 0
smtpfeed_stop
-%restart -u root
+%restart -u @l_susr@
opServiceEnabled smtpfeed || exit 0
smtpfeed_stop
sleep 1
smtpfeed_start
-%daily -u root
+%daily -u @l_susr@
opServiceEnabled smtpfeed || exit 0
shtool rotate -f \
-n${smtpfeed_log_numfiles} -s${smtpfeed_log_minsize} -d \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/spegla/rc.spegla
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.spegla
--- openpkg-src/spegla/rc.spegla 24 Jun 2003 12:08:10 -0000 1.2
+++ openpkg-src/spegla/rc.spegla 24 Jun 2003 12:17:41 -0000 1.3
@@ -6,7 +6,7 @@
%config
spegla_enable="no"
-%hourly -u root
+%hourly -u @l_susr@
opServiceEnabled spegla || exit 0
@l_prefix@/bin/spegla-mirror
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/squid/rc.squid
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.squid
--- openpkg-src/squid/rc.squid 24 Jun 2003 12:08:10 -0000 1.5
+++ openpkg-src/squid/rc.squid 24 Jun 2003 12:17:41 -0000 1.6
@@ -6,21 +6,21 @@
%config
squid_enable="yes"
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
opServiceEnabled squid || exit 0
@l_prefix@/sbin/squid -D
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
opServiceEnabled squid || exit 0
kill -TERM `cat @l_prefix@/var/squid/logs/squid.pid`
-%restart -u root
+%restart -u @l_susr@
opServiceEnabled squid || exit 0
kill -TERM `cat @l_prefix@/var/squid/logs/squid.pid`
sleep 2
@l_prefix@/sbin/squid -D
-%reload -u root
+%reload -u @l_susr@
opServiceEnabled squid || exit 0
kill -HUP `cat @l_prefix@/var/squid/logs/squid.pid`
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]