prometheanfire 15/07/20 05:37:35 Modified: puppetserver.initd Log: fixing openrc init script (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Revision Changes Path 1.2 app-admin/puppetserver/files/puppetserver.initd file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppetserver/files/puppetserver.initd?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppetserver/files/puppetserver.initd?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppetserver/files/puppetserver.initd?r1=1.1&r2=1.2 Index: puppetserver.initd =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/puppetserver/files/puppetserver.initd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- puppetserver.initd 18 Jul 2015 23:24:56 -0000 1.1 +++ puppetserver.initd 20 Jul 2015 05:37:35 -0000 1.2 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetserver/files/puppetserver.initd,v 1.1 2015/07/18 23:24:56 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetserver/files/puppetserver.initd,v 1.2 2015/07/20 05:37:35 prometheanfire Exp $ extra_commands="checkconfig" @@ -34,25 +34,23 @@ eend 1 fi + checkpath -d -m 0755 "${LOGDIR%/*}" + checkpath -d -m 0755 "${RUNDIR%/*}" checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}" checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}" - - - JAVA_ARGS="${JAVA_ARGS} -cp '${INSTALL_DIR}/puppet-server-release.jar' clojure.main -m \ - puppetlabs.trapperkeeper.main --config ${CONFIG} -b '${BOOTSTRAP_CONFIG}'" - - EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\" -XX:+HeapDumpOnOutOfMemoryError \ - -XX:HeapDumpPath=/var/log/puppetlabs/puppetserver -Djava.security.egd=/dev/urandom ${JAVA_ARGS}" + JAVA_ARGS="${JAVA_ARGS} -cp '${INSTALL_DIR}/puppet-server-release.jar' clojure.main -m puppetlabs.trapperkeeper.main --config ${CONFIG} -b '${BOOTSTRAP_CONFIG}'" + EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetlabs/puppetserver -Djava.security.egd=/dev/urandom ${JAVA_ARGS}" } start() { checkconfig || return 1 - ebegin "Starting PuppetDB" + ebegin "Starting Puppet Server" start-stop-daemon --start -u "${USER}" -g "${GROUP}" \ - --exec ${EXEC} --pidfile "${RUNDIR}/puppetserver.pid" \ - -- >> "${LOGDIR}/puppetserver-daemon.log" + -m --pidfile "${RUNDIR}/puppetserver.pid" \ + -b --exec "/bin/bash" \ + -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1" local retval=$? if [ $retval -ne 0 ]; then ewarn "Error starting puppetserver." @@ -61,7 +59,7 @@ } stop() { - ebegin "Stopping PuppetDB" + ebegin "Stopping Puppet Server" start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid" eend $? }
