summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xshare/hydractl/puppet-trigger12
-rwxr-xr-xshare/hydractl/puppet-update25
2 files changed, 30 insertions, 7 deletions
diff --git a/share/hydractl/puppet-trigger b/share/hydractl/puppet-trigger
index 378ae3f..1f964db 100755
--- a/share/hydractl/puppet-trigger
+++ b/share/hydractl/puppet-trigger
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Update puppet repository.
+# Triggers puppet agend execution.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -16,10 +16,8 @@
# License along with this program. If not, see
# <http://www.gnu.org/licenses/>.
-if [ -x '/usr/local/sbin/update-puppet-conf.sh' ]; then
- /usr/local/sbin/update-puppet-conf.sh
- chown -R puppet.puppet /etc/puppet
-else
- echo "Could not find /usr/local/sbin/update-puppet-conf.sh"
- exit 1
+if [ -e '/var/run/puppet/agent.pid' ]; then
+ kill -USR1 `cat /var/run/puppet/agent.pid`
+elif [ -e '/var/run/puppet/puppetd.pid' ]; then
+ kill -USR1 `cat /var/run/puppet/puppetd.pid`
fi
diff --git a/share/hydractl/puppet-update b/share/hydractl/puppet-update
index e69de29..378ae3f 100755
--- a/share/hydractl/puppet-update
+++ b/share/hydractl/puppet-update
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Update puppet repository.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with this program. If not, see
+# <http://www.gnu.org/licenses/>.
+
+if [ -x '/usr/local/sbin/update-puppet-conf.sh' ]; then
+ /usr/local/sbin/update-puppet-conf.sh
+ chown -R puppet.puppet /etc/puppet
+else
+ echo "Could not find /usr/local/sbin/update-puppet-conf.sh"
+ exit 1
+fi