fixing openrc init script

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

3 files changed, 30 insertions, 28 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/Manifest b/app-admin/puppetserver/Manifest
index af0f30b74551..5fe0c629f272 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX puppetserver.initd 1906 SHA256 0fe33079f9ffec950ff940e3f86961dad8ff4fba25341276cb2b65e2ee39dff1 SHA512 feadf6a5f0b2ea4525d9670f88b4bc6c3ccb1a0c97d3c71405d39dac5992c2284b471630aeb3a187360e5ca3283cd3c8cb8a64088f58726590913d76bdb3d90e WHIRLPOOL 47e0898c933939b5337838569da2b8913d53fa03ae83d714c77a18690ad4acf9c9c8866b552d26e6dcf16040cc3c76ffb2321e4c8d7bc34735f317daadb7d78b
+AUX puppetserver.initd 2005 SHA256 01e7d9d4630561785efd8e89ad4409518afe7f05d5b5d6691d69099b912a7d68 SHA512 d26be0b62c4fd740a15d655574a1b30e29d1c3c7434fdd924f88f2fa19fceaff61a4d6e0305225de519f32128cb3a9e3d2f3992f564ee2873854aacd486ecc1f WHIRLPOOL 488c4ca636f35f3c5beff4fbd9c358474c77f0b29a8f88dd636bae3f13a74b018eee6e1d206e31ba19019ad6466fa9f7b9e0b76f8d07ac6168299836a122fe5b
 DIST puppetserver-2.1.1.tar.gz 42547364 SHA256 206db88de533ebf0071a3d957aa21145500abb7748897b01f0de8e5d57dbff0c SHA512 850276fdd67f77f4c8e67be920ca4685fb267d6c90ed1eea41792c5f500ad4b199c198a4367a0faeb55d7aaf85ad531f50bd6704562c1c26bce499265d03a3d5 WHIRLPOOL aabce9259f99926788b9ff16e1b547e4f3c543a54c50a0bd3b0ef0e27eb5b1042981b5bbc73339b28b063798da3cd2453f45a40fcc77f9019f8db40fb5216f28
 EBUILD puppetserver-2.1.1.ebuild 3794 SHA256 0cedd2eb0cd0a10324cc4a90caa773e1c95344cbb26451998e34259cd2634671 SHA512 577efc60a7344f503a62e7ec14b298799bf9775a49a72329eed5e38563c39228afee2940f8e702ed97ab79b2a6b396f04c108c03453e4580cf119dc857c2979a WHIRLPOOL dfa1461ed4e0692970d958965c0e3753487b8967cad1c957e02be8819fdd3a1ef812f2cff57720b97148900f10c2cd115c40d79dba6f6afc296e7a4240a6041b
-MISC ChangeLog 764 SHA256 73895e385c6fab80dd0f9e949be0fb25d25807dc2d72a629e8c5da6c86e3186d SHA512 88a844f07fe2700990f808190fde6e16ed032232beca5d9fb35bbfea72ef72ccc6a912ebceac09b7f6e4cb00ad7c3c76e7b5c40a65e801d8aac6e327ec092005 WHIRLPOOL 0a5bdc780ed593536a576cb8927ed1e1105fb3973d0dd74e09d789352fa32aa0a7341df8f0baabcae53591ea3ac09eaccbe064c55e5585d79f28e8ef80f5dc7a
+MISC ChangeLog 878 SHA256 55c43d296cd6cf910139ea29afe0d041358cc5a8ea0366936dfb75ba21640eae SHA512 5ad7c7171faf5a1c05cb9afaf307880e37744cdf472b1f6f1a72c1ab98f58f2e2150d8582ad72ad0ab9b45a075b7c1ce700603c942b183328a18cee505a186b7 WHIRLPOOL 7c5aaee9bea21577e2864ccc6c31d5accafd4a74ebb79d4f73388a0b3995de84471ed7b18c896747c8730349236136cd23f44f5c71a7aff3a08ef13ef42cc682
 MISC metadata.xml 454 SHA256 4f640f42641af82a71290f85aab764c908f2db917457ecc3ade37b83160ef6f4 SHA512 68b9c9c957a39f1019530f36bfd55e0054ca4a271c5a40766c9f3ef5fb21daf54526edf69c7dca0bd1c523968e466634947599513010c6263781196221379993 WHIRLPOOL 9f3b571a51c54ade327a3cbb00266fa213d2f63abb7fc6d811c87b62e57e7f445bf702cbf52f6cb5d2908c01696aa0b616cc40172c25fb478a0d2b09e848361e
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVrA89AAoJEGSje+quGaTo3DEQAKj/rZ804Rf4nz0z68GdZHZ6
-uBO9UIAXX3QuY+yjJEcsNBLtaTKnqwcGRfafETEXIZHoGxDDTjhqDjefT0zcniXf
-koroHqo6cJp1aua/cCHSu863u8vvfosNK22BxWgx2ylWrSa4HrtCdIrlUyC/5dFG
-QRHoRj6FK/qaslUeBNFfoYi/quP5m7mkvFG+gH9i0n50X+Egw3JMDVs2pbpluD6G
-8JPyDZlcjeG8GTX3AyvUXSRJuB9zzo/2yXuKgjC/afXgumghZ+FeWvorhlz0aOAQ
-j16uPsVU9ZVxwPDh2VFiaaEmUxeNGuPc1r/9QjncJ/CRqeRvY3bZyYlODZZDjM85
-soviwSPSmhl+pU3bhTCEeQP4TyQLsXg38CMagC88Cengq2bk3LiBxo2NdmeQnNkR
-0IpcH+jLYg+dyA4aY3hApSFDdldmKBRlXr2aFoy8phoaRZECn58Fq63/2HKOMDun
-n7zkPBg396oKPJToKsQsfseOsw/nqCTw6JEu998fxakZT3nQTPfElrpwbmWSL6Rt
-487MEytj67W1za7xr79EC4+669p+P7rTMBSoG2qg29AD2goIZI5b0Ub98c/IQ9QB
-/bYKCloFgsP311GiU3ersZvDqC4cxxk3ovssd0caOGujtO5efoPKNa+/eZ80k0cY
-ymAqYbFDHeF4uQTKRQUh
-=tzHC
+iQIcBAEBCAAGBQJVrIlgAAoJEGSje+quGaToEDkQAKpQ6fncHsGjD4lKN+nCKIjW
+L233Fotbj7fWtFKmuFTc2impd1UhVq3VBgPkuP4cI8Zo3Mf5Fi3GTFdxu9vqhTGi
+2C0nZfwrTWDGaxD1AxitgykEHdwbEGgSc/Gfx3Xmjd/4gUCEvlkLJf3VLGEz+6hA
+0miL4VRdO7113R5z+2Eph+qQteJxVFzQVrqT4/PA1f2iH6fcnseU/N9ojIlebSM/
+viIeqY91i1HufvMp2TXPLhYeNRVdlmtWIz5a0qmoodIOmeDUWAGdSHHXSm0ShSyN
+c07e1i8miSouBF92GVQah/0xPZrXHXFRRUxlIjRvGkIQa7uH1ZpRCA1mnH36+dhn
+s21BOM9IDhVQgej4bfMK/AOLGDPHT6lzrn1BVQJ4i7Fpyh6ACHDTOUij9Tvv+peL
+0SRIaFaJVzO/fbpJz/FyTmJzspz5KsFqTJK2Bmj78YtmfQrpxTHlTdnsTFkU/eyA
+uNjcIDD2oSxsj80bflBUzb6GFSrTeR+LSIbYTdLf1QCPAqsyw7c6Cqlh1o61x974
+AhGYshxTngXM27NKxUUkqII3YO50e7hzOXMt+eMD1L5kZ1KqOsq78OL5zLQKDmgw
+9GmevcJ2sV1FZXV/sobmk/N3H8RwHED2YvEOdvZ2QznB1DTyT366h/BB+UV//a37
+hZjDW3Gig660xzGD2/t2
+=QSsA
 -----END PGP SIGNATURE-----
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 $?
 }