fixing puppet(master) reload

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

4 files changed, 36 insertions, 19 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 3c4585e7cb9e..2380ef0f4fe5 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.221 2015/05/27 05:32:52 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.222 2015/06/18 20:39:33 prometheanfire Exp $
+
+  18 Jun 2015; Matthew Thode <prometheanfire@gentoo.org> files/puppet.init-4.x,
+  files/puppetmaster.init-4.x:
+  fixing puppet(master) reload
 
 *puppet-4.1.0 (27 May 2015)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index f3b423aa70b8..69d32007f632 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -4,11 +4,11 @@ Hash: SHA256
 AUX 50puppet-mode-gentoo.el 217 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a WHIRLPOOL 60d02a9b70d418cb453d08c17fbeb1133a6ddd924ba18565e30f7c655f5abeebf71af6f17797d3045483ae8775c905efdc11396f4f9829ab2c6b95fbafc2584f
 AUX puppet-openrc-status-fix.patch 709 SHA256 76d320e7a5f8922e3f438b3baf09fb7c86dcd70e821e364cee19fd5f33596a82 SHA512 2959646f3d2a5ceed41faff64debe2dae08ef524679ee1a117ce709a22284f055d40a7a28848a8e1cee0a2603a0a6ad417560714d4bc000b3288fe7a3a5e0d81 WHIRLPOOL 030d85bfef14d74e2ccabdf249fca657beaeba36d0dcd26cf706abf1ecdb81b79a4dd95063cf0781cb9006523cd1fa86a35ac2efd70821c1f3623bd2ea11ae77
 AUX puppet.init 916 SHA256 edad76953e36dab793010955cb4775242271c3e4a22a193ecf1ade4f0716d2bf SHA512 1528e2c9f8d145663f9dab37a5928049ae1063570048f372ceeec3892b3b9e30aa84849056d7799a4a6d292c8227f8132142e115d6019f64050f4989e6584df8 WHIRLPOOL 6295f9eceda2ad94c5e5c9beee5a7549b043c646e8884c01375ec089805a40b037a533a8ce4c04c8f9ccbab0688ac75adceda14e528854ebfcf2d3462e26757c
-AUX puppet.init-4.x 642 SHA256 c4c0d6052cb3bd262b08851c9491afa4741c30f18b8801cc3adcf499af687474 SHA512 e8a0f0f1588158637736afa070b8590615a4c45dd4cfd22dacd5cce3aca194c277ca466bb44e77c531ccdedbb56481a9bc228d2acb7024e14d0c62fc44438499 WHIRLPOOL b8929cff42debf6e29e705e35c6774a628cbd061fc5943ba15aa7b99da4ca45dcc314613e88ca13a07a3adc697b1fa658957d27509097e9bcc7311a8671310e0
+AUX puppet.init-4.x 763 SHA256 4b65d1a666cde6fe15abd861bc08d1986e3e95c250585990625973985a943408 SHA512 ace44a6e91ba6f65ba5780093b1749c920acec5a0828decbdc90643054a84de1606bc591e54ad171934f87e28015c0d805a2b3df6e7f97f613b3eee185ff992d WHIRLPOOL e19ce589be8ef6a82a93e6f442c8907e5ac68774208d75c48675c69e5367aa7d8c72a22f0a6dfecce6307c77d171577966805b5da546388257c97b7b190cdf6d
 AUX puppet.init-r1 609 SHA256 1ba2b2c08e056adcb261bce51acf47dba6200246f199f25cdf44c9c3bcd3c390 SHA512 b170b7e3ed943e6cb51745288862943bcd08a6680c0b40d1211295dffda698dc4da4596599ba4540b61c786c970ec1b8a5f03f15f249fe32169d0f558bc35923 WHIRLPOOL da5c9e8e309a162d1b04be0222edb252d39be8bc17772ed6ac16f2990ca64adec6e469dd2522e3078ae0cc1bc4c7f2383bc776ec1a05868515ce35bb845e9125
 AUX puppetmaster.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058
 AUX puppetmaster.init 1089 SHA256 8e4ae53b115ec5379961af6e9f822b2d8cfa59241d7d62d3bb8f81600fcd98d9 SHA512 3cedb45ec1c9b29b6c4e8392aa610b866c99fb2204c70d5c149090478bc42ac9454091bdec5155358b662167964a61c82307243839f923f5b15eca9e28a360e6 WHIRLPOOL cb86be91131d65e6f6a54b330e82f551dadb46725b7c882ca0fae3a501adf68f0069204351c57e2b6d69f6704846c9f7ab1aa2c3162ffd9afa93cce386ca991e
-AUX puppetmaster.init-4.x 953 SHA256 7b860f490aca5b08ff6a060d5ad29c8d400ff6b878ceca11b0af3de83a8845e7 SHA512 91b614509adb20998fea8196d003b60b21fad1e1e5054c359d7cbce759f06e88a3d1122f2d09c4bef356023a42ab5bdffa695adce8d2a09a52657af7b089a65f WHIRLPOOL 26bc8bbf5cb8feedef00b72733d0c99ae41b3414052f4ca4bd0f3aed2f587b802304edd22deb38b83b194dbcd5652fd56e9f2c296eaa3c9008738c5cc5a12f74
+AUX puppetmaster.init-4.x 1107 SHA256 755e154818e8f8436c08c49bfeec959af032ac2fe0803fc0257f8440d948ce8b SHA512 cdb5b13e9f66f6e4be152b8896bf1daccf39ee75990a98f6bd339934c5d626d28fe92f108edb0a4db1840af6cdfe2a6dedc6f71a6e9d0d50c1a3460e16dc01a0 WHIRLPOOL 983a2484f0bb235857d5c74bf69da234880d2c959016bd93bd18eb8fdf1325b045bcaf72469c3283cc0e6b5135f28bfe161ccd72f7f36dcbee3caee20c8faf67
 AUX puppetmaster.init-r1 920 SHA256 00a66031624de13e28b43c186765c36f02632a614b868192e6cf4e6f1f392830 SHA512 b0b08592464111791470b126fef0ba20863dbcb011752cccc7c24303544cbbaf12fefb37eb17ad88551ced4d5d6bf2a4f81fd93e84506411f7b8b51053d34e42 WHIRLPOOL 4027629f5d188ba1a96fb0796ff5a8c8c2887936f2f9a5a4fc41a719be9a48ad4c114b2918437e6b812f01bfcbf22e2b4617092bff84b2b76c107db4c5dfc29b
 AUX tmpfiles.d 39 SHA256 bc0c1f0aa01e1df559fa6e0b8bb686a8fc83b1272bcf4f6671fbb2a9b48aaa6f SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1 WHIRLPOOL 5dc356a6ae94e262cb0a0bdbc120351bce40e81ac79e6a5122c6eff3022ddfd53724f9230c7553dcbd4648f640c4a912baf300ea5b2cb22fa7100b33de4f4909
 DIST puppet-3.4.1.tar.gz 1949373 SHA256 e6a929699a83c2bc1d1661674172ba7e92b6fb4235fa594cc2f3219925504b93 SHA512 0bbdd35387d4f1693023d2fe45d089453386d7bfb279365cf019081641298034b8cd84398567b7ce1868ec02406a51a53afc6842059442467e474bb26838d80b WHIRLPOOL 1a5d88f40d69c692a443dece46e282ce8a0415daa56ca1f62391d9d8a9d2f1da77a799605deda384b6c2f7760a7e0046a0c457216b8f350308b5c30d9b40f990
@@ -22,21 +22,22 @@ EBUILD puppet-3.7.4-r1.ebuild 5256 SHA256 bdc74c4d96466e71794a330a17d9f5cee040cf
 EBUILD puppet-3.7.4.ebuild 5246 SHA256 718252136edfc4d8bd4908fb8362dedd34250735a5a4ad3fa83e390ec7d1d177 SHA512 bfc2acde117d3b20ae285cdc5053884d3fd44c14ed817b22aba336b244be4f5d6e1bf8843cd367c52c6664af1524f201b1c607999de487df0e2d513c276fc824 WHIRLPOOL 3a0d4300ede47be728b30d0c4e87ae1cfa75f5146ad5675b5e38f5b6295e8431e1bbb34a07cd0a26ef908cfea91f383f5d7cb94a6cd58395b2b693cd45e7ed84
 EBUILD puppet-4.0.0-r2.ebuild 4484 SHA256 8b87ea61ca4b11a33e587364b82f6146bf1fba68bae9686fd41553d82939845f SHA512 b86ed3d3cead398c5677ee78aeae2581bcb2a773dcad8306ef7314bf1424779337727b7195a3fab6da39de64b6adc2bf18039f58b2684a1e470ba0eae119a201 WHIRLPOOL 25fe2bd9ea079a0153134f1f6dcc5c49533a04efd7f86c473412e57908fbb80ee2a4fae5d30925193e3e2704eb0ed4c83e442bd55c15059ca270d90306c88d0c
 EBUILD puppet-4.1.0.ebuild 4481 SHA256 93f731db802583371f05a30ee0d38eb38d7c460ca2aa4469eef9302c7c1f3557 SHA512 bcef899e43af8f2b01547fb330c42cdf70af20b6d4c7593d6d11d62028e36a5587e89802300db6ee8363b0f780a21cdf01dc5657e32038f2218372f1d44a5a92 WHIRLPOOL a9576c8d726d6bf421301817713a0549ff3307eaaa0c504fd505f9874812369717b61d68b543f4561cd1ed78b30431f3194747915cc2b4d90ee4d889ae8675ad
-MISC ChangeLog 35643 SHA256 ef962d7d5619c6860c0cc6df2185121b830b33065dc9267057b9ec1a60c4cd4d SHA512 fa52faa34d3eacfbea9089fa3374894d27ecbc032a05fd2a09a2a01f2ce178cf93e13f31e236029767d49897303cd9874a64e8c2df444e5a9e39daba14bed66b WHIRLPOOL fc5d4acb5bf0d949039cd0787c14ab69a544360c969f6533a56ab0eb0e363f755ba2088f9888682cb9ca85a8cdbfb1763fc2086722dd23c8ae4d57984001dc4a
+MISC ChangeLog 35786 SHA256 b46f6c2562e09b3b9de045790c8ec1c65e4c1d09279a06c8407bc43b5b591126 SHA512 60486f432ac410f96ed348ef92f968140f48f406bee0aba72b19dd0ad0b8aaf231c5e1e59a2489087692d76c2c3460fc99cc9c0c1d18b02d70c15f8e82166807 WHIRLPOOL 5c2de07546e56bf9eb7aaec520bb3b7156de6db842cdb491fccecbf7be950d3dbb6c60c7dce5ec24fac053ae9e6ea34a4c622f6a8db853d77ffc5a2fcc4bea62
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVZVcYAAoJEGSje+quGaTokTEP/2YFK9tG+gpG+CDxeqhJ+MwJ
-HIBu3M4UMaZWbPzlQIz3xZ7G1L4kPp5Wmo1RXMnh2OaIytUKfoO4Hoz5Bl70yoRc
-J4n5UcEwS2Zca+s4Ax+J3PdzwlLcrs21Ljr4YOatyM9oTl/Q/hD4GwxRP5UVsC5I
-SBJYAmRiLl2H+kLjgBlDP3EstkxL7K4fIsD9vlb+YhFrqvll/GkmXA6jnqW0VTqR
-M7ihzjik8ZVJ9XZXE56A6ezjtRe3GIqS/j0sxdKCcwyoa6E44HC5BWYAsmRRct8A
-fNngbfoy8pSYxW9QFl+jcLLMc3fiwX38D6JDLr/mb9qvmveoHTtArRijNqkUHeM+
-unOgUyTTBpcKL7Or0a5a5kBMlbA/UZAhfHVK2scG6z1581SF7uYA9uJuroAorkYB
-yscFBREAESlp8D6P3CS0DJKeZn1YfOKEsCVskhDIi4L+bjc6fwgmumRkTH5SQg7v
-WzEtJ+9Dne8W+urUoX3qlIxLPS57z+XUjXyVCFQPNJHD5MNZ6eubWpR/p90nOlwY
-3EX4sHM+wz8yOqmwFsUmBb2EpQJ/faQDuTtQBeuF1wZaRE9emw9V4b6lgpRUFTl+
-dqdr3Pz2eBcbSvHCEoWxa8QV/Xg1ewazKpi6rzxW2zls6+jtW6STfgkYqiTe5R+m
-leMk98VXNVSR5Ip07Du9
-=9Eh6
+iQIcBAEBCAAGBQJVgyzCAAoJEGSje+quGaTo9qwQAKlv8gzDx964hyg9HYROSIYf
+6XabOo3CHJzKIWiVPuFtEK4IHY1qkTq6SoANN+ZtG3PTN6AlASYAt09u79lGxY33
+Y0wmqyKe/QKLAsj/CEyU+7wydhmc4wPEwQQ6XWd5IqWC+NuAb3a5e7aBYXU37T0+
+zqtW5lPT8ZhZq6scW97DGsAh8fq6GO582xRyL89kwTPzRL4vx4owP6uWCqf+MpII
+Pin7wCE1NaN1YppG8OrapZMFxKheET9ND5MYWLSjkCzi4TLauzSM5SlB46pMEejY
+WdiKXdzWk6KI1XyCWjZOBexAqketmrIxjnYRL4VGmb1A9ZlL/5o6RluHEOXe65B5
+Dbz+BrXy5CRAjGRt09NVRMpzfCE9//bi2rURUTwOSuX6owgfqqMrnhLTU6pBUkZu
+hOaLbP0jhlrmmjSH8lGb3hT0X5+WwP78AT1fqZuoDcQ1oSvUscMWyoCteN8hHGN6
+t0aZL0rDBTAOi9FZl8E4bESuRFHyN9ZKb0ZisEFqmVI+R0OkfY6SpqT1PQrKJ/Us
+AuIKXeTlVxEmm+PH79HokBH7IQ9XSmvNMXYk91J7/Ria+GOSxXEFgnZh4RA6h1MD
+GTRcDNe/JB5q7W1L37ki4jzKMXKQayB3PyMxamFqlPNq1Zl2y1YQsjoRBQYMlTsE
+r57syzVdGX5B/Hpwg7/C
+=1aLy
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/files/puppet.init-4.x b/app-admin/puppet/files/puppet.init-4.x
index 10fe025b77fb..e1238012beee 100644
--- a/app-admin/puppet/files/puppet.init-4.x
+++ b/app-admin/puppet/files/puppet.init-4.x
@@ -7,9 +7,8 @@ PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
 pidfile="${PUPPET_PID_DIR}/puppet.pid"
 PUPPET_LOG_DIR="/var/log/puppet"
 
-extra_started_commands="reload"
-
 command="/usr/bin/puppet"
+extra_started_commands="reload"
 
 command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
 
@@ -22,3 +21,9 @@ start_pre() {
 	checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
 	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
 }
+
+reload() {
+    ebegin "Reloading $RC_SVCNAME"
+    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+    eend $?
+}
diff --git a/app-admin/puppet/files/puppetmaster.init-4.x b/app-admin/puppet/files/puppetmaster.init-4.x
index 3c3fa01f1058..636f58f5516b 100644
--- a/app-admin/puppet/files/puppetmaster.init-4.x
+++ b/app-admin/puppet/files/puppetmaster.init-4.x
@@ -17,6 +17,7 @@ if [ -n "${PUPPETMASTER_PORT}" ] ; then
 fi
 
 command="/usr/bin/puppet"
+extra_started_commands="reload"
 
 depend() {
 	need localmount
@@ -28,3 +29,9 @@ start_pre() {
 	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
 	checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
 }
+
+reload() {
+    ebegin "Reloading $RC_SVCNAME"
+    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+    eend $?
+}