[PC-BSD Commits] r4592 - in pcbsd/trunk/system-overlay/usr/PCBSD/Services: . cups denyhosts pf ssh

svn at pcbsd.org svn at pcbsd.org
Tue Oct 6 20:35:27 PDT 2009 

Author: kris
Date: 2009-10-06 20:35:27 -0700 (Tue, 06 Oct 2009)
New Revision: 4592

Removed:
   pcbsd/trunk/system-overlay/usr/PCBSD/Services/oss/
Modified:
   pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/restart.sh
   pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh
   pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/start.sh
   pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh
   pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/restart.sh
   pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/start.sh
   pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/stop.sh
   pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/restart.sh
   pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/start.sh
   pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/stop.sh
Log:

Updated many of our default services, fixing some start / restart bugs, cleanup, etc



Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/restart.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/restart.sh	2009-10-07 03:34:24 UTC (rev 4591)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/cups/restart.sh	2009-10-07 03:35:27 UTC (rev 4592)
@@ -2,26 +2,9 @@
 # This script restarts a currently running service
 # Return a "0" on success, or a "1" on failure
 
-ENABLED="YES"
-
-DIR=`dirname $0`
-# Check if this service is in /etc/rc.conf
-grep '^cupsd_enable="YES"' /etc/rc.conf 
-if [ "$?" != "0" ]
-then
-  ENABLED="NO"
-  ${DIR}/enable.sh
-fi
-
-/usr/local/etc/rc.d/cupsd restart
+/usr/local/etc/rc.d/cupsd onerestart
 ERR=$?
 
-if [ "${ENABLED}" = "NO" ]
-then
-  ${DIR}/disable.sh
-fi
-
-
 if [ "$ERR" = "0" ]
 then
  return 0

Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh	2009-10-07 03:34:24 UTC (rev 4591)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/restart.sh	2009-10-07 03:35:27 UTC (rev 4592)
@@ -1,26 +1,10 @@
 #!/bin/sh
 # This script restarts a currently running service
 # Return a "0" on success, or a "1" on failure
-ENABLED="YES"
 
-DIR=`dirname $0`
-# Check if this service is in /etc/rc.conf
-grep '^denyhosts_enable="YES"' /etc/rc.conf 
-if [ "$?" != "0" ]
-then
-  ENABLED="NO"
-  ${DIR}/enable.sh
-fi
-
-/usr/local/etc/rc.d/denyhosts.sh restart
+/usr/local/etc/rc.d/denyhosts onerestart
 ERR=$?
 
-if [ "${ENABLED}" = "NO" ]
-then
-  ${DIR}/disable.sh
-fi
-
-
 if [ "$ERR" = "0" ]
 then
  return 0

Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/start.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/start.sh	2009-10-07 03:34:24 UTC (rev 4591)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/start.sh	2009-10-07 03:35:27 UTC (rev 4592)
@@ -4,7 +4,7 @@
 
 DIR=`dirname $0`
 
-/usr/local/etc/rc.d/denyhosts.sh onestart
+/usr/local/etc/rc.d/denyhosts onestart
 ERR=$?
 
 if [ "$ERR" = "0" ]

Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh	2009-10-07 03:34:24 UTC (rev 4591)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/denyhosts/stop.sh	2009-10-07 03:35:27 UTC (rev 4592)
@@ -4,7 +4,7 @@
 
 DIR=`dirname $0`
 
-/usr/local/etc/rc.d/denyhosts.sh onestop
+/usr/local/etc/rc.d/denyhosts onestop
 ERR=$?
 
 if [ "$ERR" = "0" ]

Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/restart.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/restart.sh	2009-10-07 03:34:24 UTC (rev 4591)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/restart.sh	2009-10-07 03:35:27 UTC (rev 4592)
@@ -1,26 +1,10 @@
 #!/bin/sh
 # This script restarts a currently running service
 # Return a "0" on success, or a "1" on failure
-ENABLED="YES"
 
-DIR=`dirname $0`
-# Check if this service is in /etc/rc.conf
-grep '^pf_enable="YES"' /etc/rc.conf 
-if [ "$?" != "0" ]
-then
-  ENABLED="NO"
-  ${DIR}/enable.sh
-fi
-
-/etc/rc.d/pf restart
+/etc/rc.d/pf onerestart
 ERR=$?
 
-if [ "${ENABLED}" = "NO" ]
-then
-  ${DIR}/disable.sh
-fi
-
-
 if [ "$ERR" = "0" ]
 then
  return 0

Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/start.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/start.sh	2009-10-07 03:34:24 UTC (rev 4591)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/start.sh	2009-10-07 03:35:27 UTC (rev 4592)
@@ -1,26 +1,10 @@
 #!/bin/sh
 # This script starts a stopped service
 # Return 0 on success, or "1" on failure 
-ENABLED="YES"
 
-DIR=`dirname $0`
-# Check if this service is in /etc/rc.conf
-grep '^pf_enable="YES"' /etc/rc.conf 
-if [ "$?" != "0" ]
-then
-  ENABLED="NO"
-  ${DIR}/enable.sh
-fi
-
-/etc/rc.d/pf start
+/etc/rc.d/pf onestart
 ERR=$?
 
-if [ "${ENABLED}" = "NO" ]
-then
-  ${DIR}/disable.sh
-fi
-
-
 if [ "$ERR" = "0" ]
 then
  return 0

Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/stop.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/stop.sh	2009-10-07 03:34:24 UTC (rev 4591)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/pf/stop.sh	2009-10-07 03:35:27 UTC (rev 4592)
@@ -1,26 +1,10 @@
 #!/bin/sh
 # This script stops a started service
 # Return 0 on success, or "1" on failure 
-ENABLED="YES"
 
-DIR=`dirname $0`
-# Check if this service is in /etc/rc.conf
-grep '^pf_enable="YES"' /etc/rc.conf 
-if [ "$?" != "0" ]
-then
-  ENABLED="NO"
-  ${DIR}/enable.sh
-fi
-
-/etc/rc.d/pf stop
+/etc/rc.d/pf onestop
 ERR=$?
 
-if [ "${ENABLED}" = "NO" ]
-then
-  ${DIR}/disable.sh
-fi
-
-
 if [ "$ERR" = "0" ]
 then
  return 0

Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/restart.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/restart.sh	2009-10-07 03:34:24 UTC (rev 4591)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/restart.sh	2009-10-07 03:35:27 UTC (rev 4592)
@@ -1,26 +1,10 @@
 #!/bin/sh
 # This script restarts a currently running service
 # Return a "0" on success, or a "1" on failure
-ENABLED="YES"
 
-DIR=`dirname $0`
-# Check if this service is in /etc/rc.conf
-grep '^sshd_enable="YES"' /etc/rc.conf 
-if [ "$?" != "0" ]
-then
-  ENABLED="NO"
-  ${DIR}/enable.sh
-fi
-
-/etc/rc.d/sshd restart
+/etc/rc.d/sshd onerestart
 ERR=$?
 
-if [ "${ENABLED}" = "NO" ]
-then
-  ${DIR}/disable.sh
-fi
-
-
 if [ "$ERR" = "0" ]
 then
  return 0

Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/start.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/start.sh	2009-10-07 03:34:24 UTC (rev 4591)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/start.sh	2009-10-07 03:35:27 UTC (rev 4592)
@@ -1,26 +1,10 @@
 #!/bin/sh
 # This script starts a stopped service
 # Return 0 on success, or "1" on failure 
-ENABLED="YES"
 
-DIR=`dirname $0`
-# Check if this service is in /etc/rc.conf
-grep '^sshd_enable="YES"' /etc/rc.conf 
-if [ "$?" != "0" ]
-then
-  ENABLED="NO"
-  ${DIR}/enable.sh
-fi
-
-/etc/rc.d/sshd start
+/etc/rc.d/sshd onestart
 ERR=$?
 
-if [ "${ENABLED}" = "NO" ]
-then
-  ${DIR}/disable.sh
-fi
-
-
 if [ "$ERR" = "0" ]
 then
  return 0

Modified: pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/stop.sh
===================================================================
--- pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/stop.sh	2009-10-07 03:34:24 UTC (rev 4591)
+++ pcbsd/trunk/system-overlay/usr/PCBSD/Services/ssh/stop.sh	2009-10-07 03:35:27 UTC (rev 4592)
@@ -1,26 +1,10 @@
 #!/bin/sh
 # This script stops a started service
 # Return 0 on success, or "1" on failure 
-ENABLED="YES"
 
-DIR=`dirname $0`
-# Check if this service is in /etc/rc.conf
-grep '^sshd_enable="YES"' /etc/rc.conf 
-if [ "$?" != "0" ]
-then
-  ENABLED="NO"
-  ${DIR}/enable.sh
-fi
-
-/etc/rc.d/sshd stop
+/etc/rc.d/sshd onestop
 ERR=$?
 
-if [ "${ENABLED}" = "NO" ]
-then
-  ${DIR}/disable.sh
-fi
-
-
 if [ "$ERR" = "0" ]
 then
  return 0

More information about the Commits mailing list