fixing puppet(master) reload

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)

3 files changed, 19 insertions, 3 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 3c4585e7cb9e..2380ef0f4fe5 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.221 2015/05/27 05:32:52 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.222 2015/06/18 20:39:33 prometheanfire Exp $
+
+  18 Jun 2015; Matthew Thode <prometheanfire@gentoo.org> files/puppet.init-4.x,
+  files/puppetmaster.init-4.x:
+  fixing puppet(master) reload
 
 *puppet-4.1.0 (27 May 2015)
 
diff --git a/app-admin/puppet/files/puppet.init-4.x b/app-admin/puppet/files/puppet.init-4.x
index 10fe025b77fb..e1238012beee 100644
--- a/app-admin/puppet/files/puppet.init-4.x
+++ b/app-admin/puppet/files/puppet.init-4.x
@@ -7,9 +7,8 @@ PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
 pidfile="${PUPPET_PID_DIR}/puppet.pid"
 PUPPET_LOG_DIR="/var/log/puppet"
 
-extra_started_commands="reload"
-
 command="/usr/bin/puppet"
+extra_started_commands="reload"
 
 command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
 
@@ -22,3 +21,9 @@ start_pre() {
 	checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
 	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
 }
+
+reload() {
+    ebegin "Reloading $RC_SVCNAME"
+    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+    eend $?
+}
diff --git a/app-admin/puppet/files/puppetmaster.init-4.x b/app-admin/puppet/files/puppetmaster.init-4.x
index 3c3fa01f1058..636f58f5516b 100644
--- a/app-admin/puppet/files/puppetmaster.init-4.x
+++ b/app-admin/puppet/files/puppetmaster.init-4.x
@@ -17,6 +17,7 @@ if [ -n "${PUPPETMASTER_PORT}" ] ; then
 fi
 
 command="/usr/bin/puppet"
+extra_started_commands="reload"
 
 depend() {
 	need localmount
@@ -28,3 +29,9 @@ start_pre() {
 	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
 	checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
 }
+
+reload() {
+    ebegin "Reloading $RC_SVCNAME"
+    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+    eend $?
+}