betterer init scripts... er

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

3 files changed, 27 insertions, 24 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/Manifest b/app-admin/puppetdb/Manifest
index 94a644a9f258..207e3ab24242 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX puppetdb.initd 1846 SHA256 80a5832f7284ab569b56ac266751bca6444d262a41fa6ae69f0f76d80707bd94 SHA512 9da2bcb6a31388c99b26ebf4a5e6bc901d7c2acc239d7e0d399bf24fabc6ea9486a7d5b7aea33a250bb9f0f02f960111a1031a4165514148ce9204a0313770ad WHIRLPOOL ba58a08a0093c5d470b34695b9c799149fc6a9077944dc8768042c56c5fa375fb60504aaa41c3c97e47bce47609131c098b5a051a3cdb0a8671eb52b5fa5a09a
+AUX puppetdb.initd 1945 SHA256 7675cf8d7dd3214bdf19e6e0a3180ca745671e81b10684b0ffa2bd429afddaae SHA512 3afa8566e7c5fbbeb866adc9440178e9b87531d76b1778e3950a444f4347fb64d3ef5b2f89f94045e3ae92281d806593ee6c37ca6e7fe31f950bce3b88b5d5fc WHIRLPOOL 572414d84b677d8c941a95558e605eddacedabebd421b91fcd332d5a25f0a99260990a02b52fb6848edd2df1fa9afd3b866601f4aa07a57b9693f7f4542038ca
 DIST puppetdb-3.0.1.tar.gz 24693952 SHA256 b5e86d36845c62d75c078816cffd5d38d97f014da8886506819b21a6c2719366 SHA512 00960de13270a8063de1845f7f0c42a3fa4bdec10ab2b8f66ce0dba27acda1b78974c57c0f3c6e2c09187f63e85d799b94f95de563bcbc179e9d692470a1e902 WHIRLPOOL ec136a91b2712b9249defaff6ea24b6f1ed917e519850515d8c0b995c5dcbc049550b2ac9efbe585c197a5747edcdb10e490a016de2067b593c833e02d8a7426
 EBUILD puppetdb-3.0.1.ebuild 2855 SHA256 76ac880235ed362fc9e6c69e69a20fa3aa3142f3fbb2f149b8e666800587413b SHA512 fd42e497fb610b1945f4c6c33b2ff900097a2a4ae1e48a4c744c479159efb3f4516e5f63fabf26d6e9602bb5a8373f9ae31ed0d7e795043c2e11cacd76ec987d WHIRLPOOL 4f8433935c381ce1c0f78f534fffe6ebd516951ceb4862a4d50b1b080974a769ac71313b05b9a6e32dbd65e56f01ae32577598999719aae75594ca80dfa4df07
-MISC ChangeLog 1007 SHA256 5ad013dc36b8aa9096ba73310cf5e08a33ed9ec33dd267c9d93a67b131b9d135 SHA512 2dcb625a0bcfc6163727506a26091a78c5fa26de058201145fcc3667def954bd579ba232bc8800b91b17cbbeed92be664c0ef4186b43d869053065d346c8e95d WHIRLPOOL bd5abb4f3fa95293f2b26a03893c173ae67d94f2c1578590118d9c76bad20563ece0e3076b1c2f183ac40de55f344213fc7cb9135c20b06a09b866caa64a98d3
+MISC ChangeLog 1117 SHA256 0df19a0884c6ea5b9648ec1bae92a0c32c145e0b900b1741d02f1102a50b4a35 SHA512 e9ce2ed9b839d1e794609aed8f1ea6c556dd8f73eb4a9a88933c4631d2ee9189499c5909e5599665b78e7febab10985e65b3e14861dea8523fa65229231072ba WHIRLPOOL c39f2877b210c5feab9d49b882235d30542648d1d1ae98e29336002252849b9c3d70cc60447889bf10e9f16e483eeba2b398577fca72d025a20903e5b7abffc4
 MISC metadata.xml 471 SHA256 dadbeec45a119b1377e968440695bf20e2c71842eff8aabfc682101e75560dd7 SHA512 20492c379725a963a261add53895c794108c2b3832203179befd581c9cc2c7e2dc72a85ded8033601f4fbd0c5ba2e058096b9292435de812bc8823b86ed32074 WHIRLPOOL 1d987b3086bb668f411cf6b4a3e63bbf918f3b2bdb97bcd6d72570a239a4611c4d56ef20a46534c70b4d037578ef09c0bf5e23f8f02569f3b1253e4802a7a7eb
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVrA6dAAoJEGSje+quGaToKy4QAIo8srNvNyobUe7rYuy1LJEX
-dU4bHfuDNYzX4yUXy9csxUpvN+ttY+Yb3+mdN6O+/RVzLgMxjrWahoVVzLRd4oev
-Q+v4OJIjTNPaoeIV6dGujWaZDz2ddi3nMhtLetYHNvkSJJ75QUMH8OxXt6viCh6c
-eio+u+zto5SRoPKH4axTsiAr+jxAW0XE64dyEALLGajRNHBtvJ53G9jIkhbqqXQr
-O0gFjqzRPjPnkgIIjQr+Y1BANFa0aLOvLbxUkzT7e9zr/eTVFFY9zPU0fwl9pwPB
-dWFxh/K0ibHTCpZuf50U8hmXDAtEWI82yInnlj+5q4fTPxRSPARqv7wW8v0EMPJL
-OGlxRWyvj8t67S4gXB5fpl/FwTn/k9GvHF4bymuEAGd/gcNSy1ntKzBTEvsHxngd
-MYSb8LDfMJ+b+s/1yjIUKcsJBmDuRO3uZMtRxXJ98mDvgDK5v7ZmE98spimzCZUo
-LkJg7ywFSwS6b/k/U5a3bDGlcItAYSziXfBEz7GJDkMHJKhwPkHCGjrtwUMePdeO
-TZaxIFNk6qFOJg8QH1qqMyV3kU0Q4fCIL98+mM0045J5jH4KOW5vpby53xE9yy8U
-TxhVIEz5dbtHjSOhmbhQCvxVx1hPsnMpaNUoD6w01AQAw7AdWK+H6x0DcPb6bpH1
-XgDBbQWv2pVezy8dANG5
-=4P2S
+iQIcBAEBCAAGBQJVrIpdAAoJEGSje+quGaTotcoP/1mf4yJOYXSnqtiqPU3H66SA
+kkGLxx+UsZqj79RIEQJHRTq9VPLfC6mqUVhb4PLvxl1HtA2tKbbHY6/+4fxs1YOy
+A3+kBKYcDrfcfGXYhwlQbBhnrH9HSZSNYafKOEIHG15Ky9WgmpOXmXkgUPOgWqz1
+y7El2Af0dAM3KMkvqJ3KlqaKpQqLETDDqmG0cv1wfNJyGiJAIDR7OG9y5jqaakc2
+/Ms+0/l4fufDci9EdAKnnnLjTS6X7df85hH5F3QWHel4SqXBst+IUjGCN5BmjH+B
+p2gqmAAUVjYgwNtM7yEqyVQlrAF1WeURbpsGTpuEy+2DF1arxOnQNF35xvI5CXnE
+qLIauxFVN6noVWhn9jC0Ou4epKTY19j3czkr3p+GVQM2pOp9Y4ap7MNdNbceSq7s
+3ExAvLEanEkFJtJn8BL3qKJlbntWw8Y3fQr2Jh9NUZiK0BfaPBKa0hP/poem8dl6
+eTVjmHgeLnXfhHBqW6O+7JX5cWSJgHJGrqYkCHsjxGP/+u9uIVrdREuYGeqgeiV6
+R1qJo7lsNcY75l1m/reQHkg3dYCjXnNPiyQfzD8lrj6lF/vjo2yU9r6zBZNlB7qy
+ZneLob7irLWSp91chHUasZQxF+WnJcKEZFZfKNjKQ3lZ3onNZA1S7c0ye/0UO/1v
+O+Qd+AVQZwBDRLDl584d
+=/Iz8
 -----END PGP SIGNATURE-----
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."