[csw-devel] SF.net SVN: gar:[19342] csw/mgar/pkg/lang-python/salt/trunk/files

[romeotheriault at users.sourceforge.net]

Revision: 19342
          http://gar.svn.sourceforge.net/gar/?rev=19342&view=rev
Author:   romeotheriault
Date:     2012-10-01 04:24:24 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
lang-python/salt/trunk: update init scripts to work with new version of salt

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/salt/trunk/files/salt-master
    csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion

Modified: csw/mgar/pkg/lang-python/salt/trunk/files/salt-master
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/files/salt-master	2012-10-01 03:54:02 UTC (rev 19341)
+++ csw/mgar/pkg/lang-python/salt/trunk/files/salt-master	2012-10-01 04:24:24 UTC (rev 19342)
@@ -5,15 +5,15 @@
 
 PATH=/opt/csw/bin:$PATH
 export PATH
-CONF_FILE=/etc/opt/csw/salt/master
+CONF_DIR=/etc/opt/csw/salt
 PIDFILE=/var/run/salt-master.pid
 SALTMASTER=/opt/csw/bin/salt-master
 
-[ ! -f ${CONF_FILE} ] &&  exit $CONF_FILE
+[ ! -f ${CONF_DIR} ] &&  exit $CONF_DIR
 
 start_service() {
         /bin/rm -f ${PIDFILE}
-        $SALTMASTER -d -c ${CONF_FILE} 2>&1
+        $SALTMASTER -d -c ${CONF_DIR} 2>&1
 }
 
 stop_service() {

Modified: csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion	2012-10-01 03:54:02 UTC (rev 19341)
+++ csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion	2012-10-01 04:24:24 UTC (rev 19342)
@@ -5,15 +5,15 @@
 
 PATH=/opt/csw/bin:$PATH
 export PATH
-CONF_FILE=/etc/opt/csw/salt/minion
+CONF_DIR=/etc/opt/csw/salt
 PIDFILE=/var/run/salt-minion.pid
 SALTMINION=/opt/csw/bin/salt-minion
 
-[ ! -f ${CONF_FILE} ] &&  exit $CONF_FILE
+[ ! -d ${CONF_DIR} ] &&  exit $CONF_DIR
 
 start_service() {
         /bin/rm -f ${PIDFILE}
-        $SALTMINION -d -c ${CONF_FILE} 2>&1
+        $SALTMINION -d -c ${CONF_DIR} 2>&1
 }
 
 stop_service() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.