diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2015-07-20 05:37:35 +0000 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2015-07-20 05:37:35 +0000 |
| commit | 84167e6a1d2ca7849a244b0bb96c0b3788d7dfb9 (patch) | |
| tree | 6379f4bad00eb69a1eefe1ce13fbd417b8e82fd8 /app-admin | |
| parent | Stable for HPPA (bug #535580). (diff) | |
| download | gentoo-2-84167e6a1d2ca7849a244b0bb96c0b3788d7dfb9.tar.gz gentoo-2-84167e6a1d2ca7849a244b0bb96c0b3788d7dfb9.tar.bz2 gentoo-2-84167e6a1d2ca7849a244b0bb96c0b3788d7dfb9.zip | |
fixing openrc init script
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/puppetserver/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/puppetserver/files/puppetserver.initd | 22 |
2 files changed, 15 insertions, 13 deletions
diff --git a/app-admin/puppetserver/ChangeLog b/app-admin/puppetserver/ChangeLog index 92323e3d2ab6..f0f1f10a6b7b 100644 --- a/app-admin/puppetserver/ChangeLog +++ b/app-admin/puppetserver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/puppetserver # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetserver/ChangeLog,v 1.4 2015/07/19 20:56:29 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetserver/ChangeLog,v 1.5 2015/07/20 05:37:35 prometheanfire Exp $ + + 20 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> + files/puppetserver.initd: + fixing openrc init script 19 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> puppetserver-2.1.1.ebuild: diff --git a/app-admin/puppetserver/files/puppetserver.initd b/app-admin/puppetserver/files/puppetserver.initd index aa4571fd804d..6f2aa49cffdc 100644 --- a/app-admin/puppetserver/files/puppetserver.initd +++ b/app-admin/puppetserver/files/puppetserver.initd @@ -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 @@ checkconfig() { 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 @@ start() { } stop() { - ebegin "Stopping PuppetDB" + ebegin "Stopping Puppet Server" start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid" eend $? } |