From: frank <frank@uhu1.uhu-banane.de>
Date: Tue, 28 Feb 2012 14:35:33 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=bee49861341dd4001c597a39f263478ad59742fd;p=config%2Fuhu1%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/.etckeeper b/.etckeeper
index a3d7db6..35d0d1f 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -172,6 +172,7 @@ maybe chmod 0644 './conf.d/pydoc-2.7'
 maybe chmod 0644 './conf.d/pydoc-3.1'
 maybe chmod 0644 './conf.d/quota'
 maybe chmod 0644 './conf.d/rsyncd'
+maybe chmod 0644 './conf.d/salt'
 maybe chmod 0644 './conf.d/samba'
 maybe chmod 0644 './conf.d/saslauthd'
 maybe chmod 0644 './conf.d/slapd'
@@ -684,6 +685,8 @@ maybe chmod 0755 './init.d/reboot.sh'
 maybe chmod 0755 './init.d/root'
 maybe chmod 0755 './init.d/rpc.rquotad'
 maybe chmod 0755 './init.d/rsyncd'
+maybe chmod 0755 './init.d/salt.master'
+maybe chmod 0755 './init.d/salt.minion'
 maybe chmod 0755 './init.d/samba'
 maybe chmod 0755 './init.d/saslauthd'
 maybe chmod 0755 './init.d/savecache'
diff --git a/conf.d/salt b/conf.d/salt
new file mode 100644
index 0000000..1411a66
--- /dev/null
+++ b/conf.d/salt
@@ -0,0 +1,10 @@
+#
+# This options are passed to salt-master:
+#    (e.g. --log-level=trace, see salt-master --help)
+#SALT_MASTER_OPTIONS=""
+
+#
+# This options are passed to salt-minion:
+#    (e.g. --log-level=trace, see salt-minion --help)
+#SALT_MINION_OPTIONS=""
+
diff --git a/init.d/salt.master b/init.d/salt.master
new file mode 100755
index 0000000..47470d2
--- /dev/null
+++ b/init.d/salt.master
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+
+depend() {
+	use clock
+	need net netmount
+}
+
+start() {
+	ebegin "Starting salt master"
+	start-stop-daemon --start --pidfile /var/run/salt-master.pid --exec /usr/bin/salt-master -- --daemon ${SALT_MASTER_OPTIONS}
+	eend $? "Failed to start salt master"
+}
+
+stop() {
+	ebegin "Stopping salt master"
+	start-stop-daemon --stop --pidfile /var/run/salt-master.pid
+	eend $? "Failed to stop salt master"
+}
+
diff --git a/init.d/salt.minion b/init.d/salt.minion
new file mode 100755
index 0000000..6e10fac
--- /dev/null
+++ b/init.d/salt.minion
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+
+depend() {
+	use clock
+	need net netmount
+}
+
+start() {
+	ebegin "Starting salt minion"
+	start-stop-daemon --start --pidfile /var/run/salt-minion.pid --exec /usr/bin/salt-minion -- --daemon ${SALT_MINION_OPTIONS}
+	eend $? "Failed to start salt minion"
+}
+
+stop() {
+	ebegin "Stopping salt minion"
+	start-stop-daemon --stop --pidfile /var/run/salt-minion.pid
+	eend $? "Failed to stop salt minion"
+}
+