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: 08-Jul-2003 21:39:13
Branch: HEAD Handle: 2003070820390903
Modified files:
openpkg-src/inn rc.inn
openpkg-src/postgresql rc.postgresql
openpkg-src/rt rc.rt
openpkg-src/tomcat rc.tomcat
openpkg-src/tomcat4 rc.tomcat4
Log:
rclint police: fix invalid run command section order
Summary:
Revision Changes Path
1.12 +4 -4 openpkg-src/inn/rc.inn
1.5 +4 -4 openpkg-src/postgresql/rc.postgresql
1.7 +4 -4 openpkg-src/rt/rc.rt
1.8 +3 -3 openpkg-src/tomcat/rc.tomcat
1.6 +3 -3 openpkg-src/tomcat4/rc.tomcat4
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/inn/rc.inn
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.inn
--- openpkg-src/inn/rc.inn 28 Jun 2003 14:28:31 -0000 1.11
+++ openpkg-src/inn/rc.inn 8 Jul 2003 19:39:09 -0000 1.12
@@ -25,11 +25,11 @@
opServiceEnabled inn || exit 0
@l_prefix@/bin/ctlinnd reload all rc.inn:reload
-%daily -u @l_rusr@
- opServiceEnabled inn || exit 0
- @l_prefix@/libexec/inn/news.daily expireover lowmark delayrm
-
%quarterly -u @l_rusr@
opServiceEnabled inn || exit 0
opServiceEnabled inn_nntpsend && @l_prefix@/bin/nntpsend || true
+
+%daily -u @l_rusr@
+ opServiceEnabled inn || exit 0
+ @l_prefix@/libexec/inn/news.daily expireover lowmark delayrm
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/postgresql/rc.postgresql
============================================================================
$ cvs diff -u -r1.4 -r1.5 rc.postgresql
--- openpkg-src/postgresql/rc.postgresql 24 Jun 2003 12:08:01 -0000 1.4
+++ openpkg-src/postgresql/rc.postgresql 8 Jul 2003 19:39:10 -0000 1.5
@@ -21,6 +21,10 @@
postgresql_opts="-i -h $postgresql_socket_inet -k $postgresql_socket_unix"
postgresql_opts="$postgresql_opts $postgresql_flags"
+%status -u @l_rusr@
+ opServiceEnabled postgresql || exit 0
+ @l_prefix@/bin/pg_ctl status -D $postgresql_datadir
+
%start -p 200 -u @l_rusr@
opServiceEnabled postgresql || exit 0
@l_prefix@/bin/pg_ctl start -l $postgresql_log_file -D $postgresql_datadir -o
"$postgresql_opts"
@@ -36,10 +40,6 @@
%reload -u @l_rusr@
opServiceEnabled postgresql || exit 0
@l_prefix@/bin/pg_ctl reload -D $postgresql_datadir
-
-%status -u @l_rusr@
- opServiceEnabled postgresql || exit 0
- @l_prefix@/bin/pg_ctl status -D $postgresql_datadir
%daily -u @l_rusr@
opServiceEnabled postgresql || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rt/rc.rt
============================================================================
$ cvs diff -u -r1.6 -r1.7 rc.rt
--- openpkg-src/rt/rc.rt 24 Jun 2003 12:08:06 -0000 1.6
+++ openpkg-src/rt/rc.rt 8 Jul 2003 19:39:11 -0000 1.7
@@ -35,6 +35,10 @@
sleep 2
${rt_apachectl} start
+%hourly -u @l_rusr@
+ opServiceEnabled rt || exit 0
+ find $rt_sessiondir -type f -amin +600 -exec rm '{}' \;
+
%daily -u @l_rusr@
opServiceEnabled rt || exit 0
if [ ".$rt_log_files" != . ]; then
@@ -53,8 +57,4 @@
-E "${rt_apachectl} restart; $rt_err_rotepilog" \
$rt_err_files
fi
-
-%hourly -u @l_rusr@
- opServiceEnabled rt || exit 0
- find $rt_sessiondir -type f -amin +600 -exec rm '{}' \;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/rc.tomcat
============================================================================
$ cvs diff -u -r1.7 -r1.8 rc.tomcat
--- openpkg-src/tomcat/rc.tomcat 24 Jun 2003 12:08:12 -0000 1.7
+++ openpkg-src/tomcat/rc.tomcat 8 Jul 2003 19:39:12 -0000 1.8
@@ -14,19 +14,19 @@
$TOMCAT_HOME/bin/tomcat.sh start
fi
-%restart -p 200 -u @l_rusr@
+%stop -p 200 -u @l_rusr@
if opServiceEnabled tomcat; then
JAVA_HOME="$jdk_home"; export JAVA_HOME
TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
$TOMCAT_HOME/bin/tomcat.sh stop
- $TOMCAT_HOME/bin/tomcat.sh start
fi
-%stop -p 200 -u @l_rusr@
+%restart -p 200 -u @l_rusr@
if opServiceEnabled tomcat; then
JAVA_HOME="$jdk_home"; export JAVA_HOME
TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
$TOMCAT_HOME/bin/tomcat.sh stop
+ $TOMCAT_HOME/bin/tomcat.sh start
fi
%env
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat4/rc.tomcat4
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.tomcat4
--- openpkg-src/tomcat4/rc.tomcat4 24 Jun 2003 12:08:13 -0000 1.5
+++ openpkg-src/tomcat4/rc.tomcat4 8 Jul 2003 19:39:12 -0000 1.6
@@ -14,19 +14,19 @@
$CATALINA_HOME/bin/startup.sh
fi
-%restart -p 200 -u @l_rusr@
+%stop -p 200 -u @l_rusr@
if opServiceEnabled tomcat4; then
JAVA_HOME="$java_home"; export JAVA_HOME
CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
$CATALINA_HOME/bin/shutdown.sh
- $CATALINA_HOME/bin/startup.sh
fi
-%stop -p 200 -u @l_rusr@
+%restart -p 200 -u @l_rusr@
if opServiceEnabled tomcat4; then
JAVA_HOME="$java_home"; export JAVA_HOME
CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
$CATALINA_HOME/bin/shutdown.sh
+ $CATALINA_HOME/bin/startup.sh
fi
%env
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
