prometheanfire 15/06/18 20:39:33 Modified: puppetmaster.init-4.x puppet.init-4.x Log: fixing puppet(master) reload (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Revision Changes Path 1.2 app-admin/puppet/files/puppetmaster.init-4.x file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppetmaster.init-4.x?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppetmaster.init-4.x?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppetmaster.init-4.x?r1=1.1&r2=1.2 Index: puppetmaster.init-4.x =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppetmaster.init-4.x,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- puppetmaster.init-4.x 30 Apr 2015 01:28:39 -0000 1.1 +++ puppetmaster.init-4.x 18 Jun 2015 20:39:33 -0000 1.2 @@ -17,6 +17,7 @@ fi command="/usr/bin/puppet" +extra_started_commands="reload" depend() { need localmount @@ -28,3 +29,9 @@ 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 $? +} 1.2 app-admin/puppet/files/puppet.init-4.x file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppet.init-4.x?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppet.init-4.x?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppet.init-4.x?r1=1.1&r2=1.2 Index: puppet.init-4.x =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppet.init-4.x,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- puppet.init-4.x 30 Apr 2015 01:28:39 -0000 1.1 +++ puppet.init-4.x 18 Jun 2015 20:39:33 -0000 1.2 @@ -7,9 +7,8 @@ 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 @@ 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 $? +}
