diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2015-07-20 05:41:49 +0000 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2015-07-20 05:41:49 +0000 |
| commit | 09a114d135738f611317accfe46824c342c4c5b2 (patch) | |
| tree | 367582f51d87422c30489fc2bc4b18b519d06eff /app-admin/puppetdb | |
| parent | Stable for HPPA (bug #534906). (diff) | |
| download | gentoo-2-09a114d135738f611317accfe46824c342c4c5b2.tar.gz gentoo-2-09a114d135738f611317accfe46824c342c4c5b2.tar.bz2 gentoo-2-09a114d135738f611317accfe46824c342c4c5b2.zip | |
betterer init scripts... er
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Diffstat (limited to 'app-admin/puppetdb')
| -rw-r--r-- | app-admin/puppetdb/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/puppetdb/files/puppetdb.initd | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/app-admin/puppetdb/ChangeLog b/app-admin/puppetdb/ChangeLog index 10152848af22..8f499d404d06 100644 --- a/app-admin/puppetdb/ChangeLog +++ b/app-admin/puppetdb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/puppetdb # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetdb/ChangeLog,v 1.6 2015/07/19 20:53:49 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetdb/ChangeLog,v 1.7 2015/07/20 05:41:49 prometheanfire Exp $ + + 20 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> files/puppetdb.initd: + betterer init scripts... er 19 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> puppetdb-3.0.1.ebuild: more binaries diff --git a/app-admin/puppetdb/files/puppetdb.initd b/app-admin/puppetdb/files/puppetdb.initd index d360a6731f1b..45ca6c289389 100644 --- a/app-admin/puppetdb/files/puppetdb.initd +++ b/app-admin/puppetdb/files/puppetdb.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/puppetdb/files/puppetdb.initd,v 1.2 2015/07/18 09:11:01 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppetdb/files/puppetdb.initd,v 1.3 2015/07/20 05:41:49 prometheanfire Exp $ extra_commands="checkconfig" @@ -34,14 +34,13 @@ 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}/puppetdb.jar' clojure.main -m puppetlabs.puppetdb.main \ - --config ${CONFIG} -b '${BOOTSTRAP_CONFIG}'" - - EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\" -XX:+HeapDumpOnOutOfMemoryError \ - -XX:HeapDumpPath=/var/log/puppetlabs/puppetdb -Djava.security.egd=/dev/urandom ${JAVA_ARGS}" + JAVA_ARGS="${JAVA_ARGS} -cp '${INSTALL_DIR}/puppetdb.jar' clojure.main -m puppetlabs.puppetdb.main --config ${CONFIG} -b '${BOOTSTRAP_CONFIG}'" + EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetlabs/puppetdb -Djava.security.egd=/dev/urandom ${JAVA_ARGS}" } start() { @@ -49,8 +48,9 @@ start() { ebegin "Starting PuppetDB" start-stop-daemon --start -u "${USER}" -g "${GROUP}" \ - --exec ${EXEC} --pidfile "${RUNDIR}/puppetdb.pid" \ - -- >> "${LOGDIR}/puppetdb-daemon.log" + -m --pidfile "${RUNDIR}/puppetdb.pid" \ + -b --exec "/bin/bash" \ + -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1" local retval=$? if [ $retval -ne 0 ]; then ewarn "Error starting puppetdb." |