prometheanfire 15/04/30 01:28:39 Added: puppetmaster.init-4.x puppet.init-4.x Log: more fixes for 4.0 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Revision Changes Path 1.1 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.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppetmaster.init-4.x?rev=1.1&content-type=text/plain Index: puppetmaster.init-4.x =================================================================== #!/sbin/runscript # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 if [ "${SVCNAME}" = "puppetmaster" ] ; then PUPPETMASTER_PID="master" else PUPPETMASTER_PID="${SVCNAME#*.}" fi PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}" pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid" PUPPET_LOG_DIR="/var/log/puppet" command_args="master --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPETMASTER_EXTRA_OPTS}" if [ -n "${PUPPETMASTER_PORT}" ] ; then command_args="${command_args} --masterport ${PUPPETMASTER_PORT}" fi command="/usr/bin/puppet" depend() { need localmount use dns logger slapd netmount nfsmount } start_pre() { checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}" checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR} checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log" } 1.1 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.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppet.init-4.x?rev=1.1&content-type=text/plain Index: puppet.init-4.x =================================================================== #!/sbin/runscript # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 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" command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}" depend() { need localmount use dns logger puppetmaster netmount nfsmount } start_pre() { checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}" checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR} }
