[csw-devel] SF.net SVN: gar:[19147] csw/mgar/pkg/lang-python/salt/trunk
romeotheriault at users.sourceforge.net
romeotheriault at users.sourceforge.net
Wed Sep 5 04:44:52 CEST 2012
Revision: 19147
http://gar.svn.sourceforge.net/gar/?rev=19147&view=rev
Author: romeotheriault
Date: 2012-09-05 02:44:51 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
lang-python/salt/trunk: change smf names and remove uncommited line
Modified Paths:
--------------
csw/mgar/pkg/lang-python/salt/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/lang-python/salt/trunk/files/salt-master
csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion
Removed Paths:
-------------
csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master
csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion
Modified: csw/mgar/pkg/lang-python/salt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-04 20:53:51 UTC (rev 19146)
+++ csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-05 02:44:51 UTC (rev 19147)
@@ -10,8 +10,8 @@
MASTER_SITES = https://github.com/downloads/saltstack/salt/
DISTFILES += $(DISTNAME).tar.gz
-DISTFILES += cswsalt-minion
-DISTFILES += cswsalt-master
+DISTFILES += salt-minion
+DISTFILES += salt-master
RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-yaml
RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-m2crypto
@@ -20,8 +20,6 @@
RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-pyzmq
RUNTIME_DEP_PKGS_CSWpy-salt += CSWpy-msgpack-python
-#CHECKPKG_OVERRIDES_CSWpy-salt += pkginfo-opencsw-repository-uncommitted
-
CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-m2crypto
CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-yaml
CHECKPKG_OVERRIDES_CSWpy-salt += surplus-dependency|CSWpy-crypto
@@ -37,8 +35,8 @@
TEST_SCRIPTS =
-INITSMF += $(sysconfdir)/init.d/cswsalt-minion
-INITSMF += $(sysconfdir)/init.d/cswsalt-master
+INITSMF += $(sysconfdir)/init.d/salt-minion
+INITSMF += $(sysconfdir)/init.d/salt-master
PRESERVECONF += $(sysconfdir)/salt/minion
PRESERVECONF += $(sysconfdir)/salt/master
@@ -59,7 +57,7 @@
mv $(CONFDEST)/master.template $(CONFDEST)/master
# Copy init script in place
ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/init.d
- ginstall -m 755 $(DOWNLOADDIR)/cswsalt-minion $(DESTDIR)$(sysconfdir)/init.d
- ginstall -m 755 $(DOWNLOADDIR)/cswsalt-master $(DESTDIR)$(sysconfdir)/init.d
+ ginstall -m 755 $(DOWNLOADDIR)/salt-minion $(DESTDIR)$(sysconfdir)/init.d
+ ginstall -m 755 $(DOWNLOADDIR)/salt-master $(DESTDIR)$(sysconfdir)/init.d
@$(MAKECOOKIE)
Deleted: csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master 2012-09-04 20:53:51 UTC (rev 19146)
+++ csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-master 2012-09-05 02:44:51 UTC (rev 19147)
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-#AUTOENABLE no
-#
-
-PATH=/opt/csw/bin:$PATH
-export PATH
-CONF_FILE=/etc/opt/csw/salt/master
-PIDFILE=/var/run/salt-master.pid
-SALTMASTER=/opt/csw/bin/salt-master
-
-[ ! -f ${CONF_FILE} ] && exit $CONF_FILE
-
-start_service() {
- /bin/rm -f ${PIDFILE}
- $SALTMASTER -d -c ${CONF_FILE} 2>&1
-}
-
-stop_service() {
- if [ -f "$PIDFILE" ]; then
- /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE`
- fi
-}
-
-case "$1" in
-start)
- start_service
- ;;
-stop)
- stop_service
- ;;
-restart)
- stop_service
- sleep 1
- start_service
- ;;
-*)
- echo "Usage: $0 {start|stop|restart}"
- exit 1
- ;;
-esac
Deleted: csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion 2012-09-04 20:53:51 UTC (rev 19146)
+++ csw/mgar/pkg/lang-python/salt/trunk/files/cswsalt-minion 2012-09-05 02:44:51 UTC (rev 19147)
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-#AUTOENABLE no
-#
-
-PATH=/opt/csw/bin:$PATH
-export PATH
-CONF_FILE=/etc/opt/csw/salt/minion
-PIDFILE=/var/run/salt-minion.pid
-SALTMINION=/opt/csw/bin/salt-minion
-
-[ ! -f ${CONF_FILE} ] && exit $CONF_FILE
-
-start_service() {
- /bin/rm -f ${PIDFILE}
- $SALTMINION -d -c ${CONF_FILE} 2>&1
-}
-
-stop_service() {
- if [ -f "$PIDFILE" ]; then
- /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE`
- fi
-}
-
-case "$1" in
-start)
- start_service
- ;;
-stop)
- stop_service
- ;;
-restart)
- stop_service
- sleep 1
- start_service
- ;;
-*)
- echo "Usage: $0 {start|stop|restart}"
- exit 1
- ;;
-esac
Added: csw/mgar/pkg/lang-python/salt/trunk/files/salt-master
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/files/salt-master (rev 0)
+++ csw/mgar/pkg/lang-python/salt/trunk/files/salt-master 2012-09-05 02:44:51 UTC (rev 19147)
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+#AUTOENABLE no
+#
+
+PATH=/opt/csw/bin:$PATH
+export PATH
+CONF_FILE=/etc/opt/csw/salt/master
+PIDFILE=/var/run/salt-master.pid
+SALTMASTER=/opt/csw/bin/salt-master
+
+[ ! -f ${CONF_FILE} ] && exit $CONF_FILE
+
+start_service() {
+ /bin/rm -f ${PIDFILE}
+ $SALTMASTER -d -c ${CONF_FILE} 2>&1
+}
+
+stop_service() {
+ if [ -f "$PIDFILE" ]; then
+ /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE`
+ fi
+}
+
+case "$1" in
+start)
+ start_service
+ ;;
+stop)
+ stop_service
+ ;;
+restart)
+ stop_service
+ sleep 1
+ start_service
+ ;;
+*)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+ ;;
+esac
Added: csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion (rev 0)
+++ csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion 2012-09-05 02:44:51 UTC (rev 19147)
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+#AUTOENABLE no
+#
+
+PATH=/opt/csw/bin:$PATH
+export PATH
+CONF_FILE=/etc/opt/csw/salt/minion
+PIDFILE=/var/run/salt-minion.pid
+SALTMINION=/opt/csw/bin/salt-minion
+
+[ ! -f ${CONF_FILE} ] && exit $CONF_FILE
+
+start_service() {
+ /bin/rm -f ${PIDFILE}
+ $SALTMINION -d -c ${CONF_FILE} 2>&1
+}
+
+stop_service() {
+ if [ -f "$PIDFILE" ]; then
+ /usr/bin/kill -TERM `/usr/bin/cat $PIDFILE`
+ fi
+}
+
+case "$1" in
+start)
+ start_service
+ ;;
+stop)
+ stop_service
+ ;;
+restart)
+ stop_service
+ sleep 1
+ start_service
+ ;;
+*)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+ ;;
+esac
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list