Browse Source

rclint police: fix invalid run command section order

Thomas Lotterer 22 years ago
parent
commit
4e78b5a049
5 changed files with 18 additions and 18 deletions
  1. 4 4
      inn/rc.inn
  2. 4 4
      postgresql/rc.postgresql
  3. 4 4
      rt/rc.rt
  4. 3 3
      tomcat/rc.tomcat
  5. 3 3
      tomcat4/rc.tomcat4

+ 4 - 4
inn/rc.inn

@@ -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
+

+ 4 - 4
postgresql/rc.postgresql

@@ -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"
@@ -37,10 +41,6 @@
     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
     shtool rotate -f \

+ 4 - 4
rt/rc.rt

@@ -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
@@ -54,7 +58,3 @@
             $rt_err_files
     fi
 
-%hourly -u @l_rusr@
-    opServiceEnabled rt || exit 0
-    find $rt_sessiondir -type f -amin +600 -exec rm '{}' \;
-

+ 3 - 3
tomcat/rc.tomcat

@@ -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

+ 3 - 3
tomcat4/rc.tomcat4

@@ -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