diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/admin/puppet/Manifest | 34 | ||||
| -rw-r--r-- | app/admin/puppet/puppet.SlackBuild | 2 | ||||
| -rw-r--r-- | app/admin/puppet/rc.puppet.new | 13 | ||||
| -rw-r--r-- | app/admin/puppet/rc.puppetmaster.new | 13 |
4 files changed, 34 insertions, 28 deletions
diff --git a/app/admin/puppet/Manifest b/app/admin/puppet/Manifest index 40895377..8b5aa300 100644 --- a/app/admin/puppet/Manifest +++ b/app/admin/puppet/Manifest @@ -2,25 +2,25 @@ Hash: SHA256 DIST puppet-0.24.8.tgz 1099188 MD5 288d46dee00acad64d0f3ecc6d8ba6fa RMD160 edb187da9225c9faee9839a5d644b5c9c91f3d5f SHA1 a871aef6f3e8e060f5109bb022967066e32875be SHA256 9e9dcfdd26f96e0b0b4ca9bcfe6f473c679ff082a0cd7226c2058ae652d4fdc8 SHA512 bbcfb92c073cc20f2a74e923f79316e4bf829da26ad8b590563ac1cf9cda6fbc7eb541a2c0c26a527a66ee15a146d557833635a67efdaca3f8eccdf63b4d62a3 -MISC rc.puppet.new 608 MD5 060bad75020e4145e0b51210b91eb53f RMD160 7a7a4a44daf083493a40b52380d33056283bbed1 SHA1 7d8a1b4a13839c44f4fd6439c1c54ee14f46082c SHA256 b3320132edf2a0fbebe93348e955759c2f43933dadd51af342abdd15282c696c SHA512 28f084fbe810c598ca15e0ce7f595ef9484db4df0c0011b7e88eba0e78de3b2167bb3fdd2e1d2805933e6b9e5ff4d9478cf9c4aa8d2003f421dbfc44874a5c6b -MISC rc.puppetmaster.new 692 MD5 d25010e67952ea9f9f8c341c8464921b RMD160 f76450346aa9e2614caace9982a4a88b24c30ff4 SHA1 35f3841229b3e4ce20f1c12e43ffa03e32cd006f SHA256 4a013d918601a5812d722bf4cab1b1aaf5e116ae30bed7e72e71ec221907650a SHA512 f602611962d42410b9b06169cdf8e7a8e8e292dd62e5a44793025323566446b5976ea39d6fe26e2f7b675b25aa6aaadd426bddb08c2f4afc9897966e98f9f13c -MKBUILD puppet.mkbuild 5282 MD5 8006bcbc0abbf29d59f1b6296371d3f0 RMD160 2f93d8e71756e41d5e194afd24ff2281aa3ab94c SHA1 43a315841c7ee139702fdf9b09c34b19aa13156c SHA256 5ea76ffe630b3a441cb3f2096826609927ae62613bc59a2995ca60579c66b70f SHA512 46522d5dc97f0e472de38b66b9826dd310c4024d558c1c91ffdc80978dcb4f37ac5ed2993d5c3b539df12f065fdb927a1ce9c5366daf973c2bd1725d796952bb +MISC rc.puppet.new 659 MD5 e0fd0141c6f285f923a052efc6353c71 RMD160 d27837b7c1945790b67da93aeca96486eb20070b SHA1 16c72e16fbd80ddc9921aba7aeac33ca217e6ead SHA256 f04ba604aa0505ec0f0f54c7054ecee21824ca5fe8e1aeb2fc73edc8640920b7 SHA512 a6fec5e422d989a646c9e0eb23cfd80700fc62e540ac9b580a27b13e5d41fd4fdfd53f9d4e72b568f8f4782550300ea7be5f25656c07355d5e5731fc98042dbd +MISC rc.puppetmaster.new 737 MD5 23dcb314b12d87eb531c4eea1c047b2a RMD160 a4276a485b99f0a8a4deaa4356d8eea915cfb828 SHA1 fcab592c1418ecfde19b2e2c48db4bf39ac0a349 SHA256 e8ca5651e1de03e3da95e799e276057c03fd48f2f6da9c37c85cf5f94ded46d5 SHA512 993ad954231c52ce5a80b83ed12095c925049f8d388fd316c9585cc8f9aa487919da4a591afe21859550475bb2bb0e75fa7d6a0565b34f2aef6421359eb0e425 +MKBUILD puppet.mkbuild 5282 MD5 e4d99df1b9c0b5845de28870e0fd2420 RMD160 54b25deb5da26c69f376b46ea1248e434fe7d028 SHA1 1c2e5371b5fd2c874c424aea90a4a03d624c3fcf SHA256 d03d8679f86944a54ea4f22158ed71a108fc07fe42af65df46fcfafdb17f1fe1 SHA512 a6f04c9bb4398cee4f5815226922314b9131197cde71172d5e6503933b139535f6f0a05e348866d69a484e9dbfe628583af82ee3aac36c3a04d99e436b96c84b SLACK-REQUIRED slack-required 88 MD5 2037e0312db77ea7af8eb36c2924497b RMD160 21ed35e57720877744b3af57274fb3735e5fea6b SHA1 ed5f326178af5e3cb6e0c6e3f29e5dbe0c1d6538 SHA256 815fd9b9250c3b44ee5eafe02db47ccc5222cf6cc08db0e2fc3a00371484b2cb SHA512 2e2a433f8ecb778c0092672082b9a44d43d5a99e2ac61e82d3c7cb184758365119b097461699d75a512fe4a67d11e4bca9e3b10b4e3c683dbd92b43717ac3dce -SLACKBUILD puppet.SlackBuild 7997 MD5 bc0031178c8880a352726942d0c3d13e RMD160 95e2ad8494123425eb8a789621e5fd31b2a1d3d5 SHA1 00b44a9df3ebbd8217cf30c7e66e34f02ad089a5 SHA256 9db8850710ce895b74254460694fda026eb3e57c0de60bbae85480c8a3e56a3e SHA512 c8912526963199f9de29ece17af6610ce55b6b90ff9e27c71c846c3d96df0ef7d6b02261d7de725ac9a18660e40cac59e882bc0c7fa0d1cd5ef84bb72a797083 +SLACKBUILD puppet.SlackBuild 7997 MD5 70ab1f3112011cb418f0836da9e1a29e RMD160 427ac24a9b777f3dac761dd7c3a6940114d7a199 SHA1 fe0a301e9452bf70618050a1f8e07af7ed7a037a SHA256 abefdfe94444598b1b5b8572351febe1bb3916ca93fed01cb71097a1dada4baf SHA512 9f5ca9205587f25a5f343193bff05ce6a11f7544071ed4d5aa9c95b808c73c6e325769b824fe9774856d85c2471bfc73a7b793e39176c96577aed8dead93bf03 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) -iQIcBAEBCAAGBQJKSAWqAAoJEEHL93ESzgeian4P/1FKFidrU4NDVyoBOkqwEg89 -2MUo97Uw8CTrCeUdGsbpH6wnIhEFOdisniv5t2R8wg9pX62U9Nlcsxft/e5l5IXg -Er52J9ljZlwICxSq/wscvmTBCtaVHjCeZUEq+oj90g+UaWIGhFeZ62GPFE6p/LGg -GiZeeZmo9JyzbRARcIwCukUSch+XoGv6OYqqE8FZ751bLy6TzZmbsJklT9kezoZ3 -YZMKURWERyM16QCH8/ov9Zh8xAuXvYsYZZHGYPbEDqDJSS7UJQojuh+HvGzpF1l5 -V0aq6AhSHaFOyIM3u64T3/VLM36gPyNJE7fOM3gVNoGlt8ADAZWexJfY2Ic1aD0O -/v34J3CsgplI2vIOuTz8mh5ECgdzrkOzHUkqn27LNnMos1HgEu1o/eVg90Pbj81x -KnY5H1e11JPVjNofLjqZ/mjn7e7BulPtLnyYC9WnRahZg/et49eoCML6+GvMpSEw -WerM48yciaG8YaHol1sYa0NNKEys0OXEebJ9dnky47zGpR0rDMXaUiK8lJWZrbTy -rxLQLt0KFQ1W+1nTMZBcGVcHnFfsUYZgkAM+WKgxFdYLiwHspJuogvl8jZcrrE54 -N2OqXddTOQZPQ4IsbrbM/ItRuNpg2c4O/QvMEyvjUmbiNWVOKdROX6MlkdJHrZdO -b3ofGF74qqAmMnSLjmOR -=AwPv +iQIcBAEBCAAGBQJKSBZsAAoJEEHL93ESzgeimyMQALe08W1Ep/s0Y8Ess6y+L7z/ +2lvLQcVjQm6EDhZQgNvV/16gnS2RnZYTn5lzPAPQV3y4xz19H6DazvSso7edzhrM +i/hRr7K/NQkTOEmhXQ8949n1EIkmAeUNLrw/hkJv3qo/9QldY/7Yzc+GxvjJ/LPO +ttDnUaP6TaXgcAVjHXLr3Vwi98zvfseS9FE90ahgcll2lM4oLH7nHT1TOxobCjxY +MYbfRaF6Ez6NP/Jsbcj3Al0DCLDl76UDIhvVdx81ZyBhpBuzqLDzZnZhkf8Jg433 +kU/+6qpPw+Dpnrtdcr5y4vSxvAWJcZngSge8wsUf+MCB7b2Hh+0Tuh99EAq4IDid +gPP1Rh/auCl8Sbn093+g+pjqEghqherWXg7vMuRjzxhEyYuxA/PQlDKUHA6NO5vV +w57edFBMYq9Crzc2V8XZRg+EIsIZZEJf/AhyYvyf+P7l7EEWL/mmRHEVxxHWdeWU +KFI6mXJLusw5oISSM6mtq0NxElFMLDu8VMch/F7kAYyuQ5BdQEpI442ZqJY4slVw +Cwb4J55CBATgtT4B9LPJgaS6R0tTR5rM20gbq84Br6WsyWSTqlsx4+i08YWnYk4y +1w/4g4rJEjgpO6cVAHsoXOl+JdyDoZAbVPjnG/LHrBW+Dx97OCjXNCTO5wiy/4UA +c8i2M4vH34VFWY04wn21 +=cm9O -----END PGP SIGNATURE----- diff --git a/app/admin/puppet/puppet.SlackBuild b/app/admin/puppet/puppet.SlackBuild index aa4ef57f..c5169d85 100644 --- a/app/admin/puppet/puppet.SlackBuild +++ b/app/admin/puppet/puppet.SlackBuild @@ -34,7 +34,7 @@ PKG_NAME="puppet" ARCH=${ARCH:=i486} SRC_VERSION=${VERSION:=0.24.8} PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')" -BUILD=${BUILD:=2rha} +BUILD=${BUILD:=3rha} SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} diff --git a/app/admin/puppet/rc.puppet.new b/app/admin/puppet/rc.puppet.new index d9738c0d..b623d2a9 100644 --- a/app/admin/puppet/rc.puppet.new +++ b/app/admin/puppet/rc.puppet.new @@ -1,10 +1,13 @@ #!/bin/sh +pidfile="/var/run/puppet/puppetd.pid" +options="--pidfile $pidfile" + puppet_start() { - echo "Starting puppet" - start-stop-daemon --start --quiet \ - --pidfile "/var/run/puppetd.pid" \ - --exec /usr/bin/puppetd + echo "Starting puppet" + start-stop-daemon --start --quiet \ + --pidfile $pidfile \ + --exec /usr/bin/puppetd -- $options if [ "$?" != "0" ]; then echo "Failed to start puppet" fi @@ -13,7 +16,7 @@ puppet_start() { puppet_stop() { echo "Stopping puppet" start-stop-daemon --stop --quiet \ - --pidfile "/var/run/puppet/puppetd.pid" + --pidfile $pidfile if [ "$?" != "0" ]; then echo "Failed to stop puppet" fi diff --git a/app/admin/puppet/rc.puppetmaster.new b/app/admin/puppet/rc.puppetmaster.new index 1217fbc6..3ad5a9e0 100644 --- a/app/admin/puppet/rc.puppetmaster.new +++ b/app/admin/puppet/rc.puppetmaster.new @@ -1,10 +1,13 @@ #!/bin/sh +pidfile="/var/run/puppet/puppetmasterd.pid" +options="--pidfile $pidfile" + puppetmaster_start() { - echo "Starting puppetmaster" - start-stop-daemon --start --quiet \ - --pidfile "/var/run/puppetmasterd.pid" \ - --exec /usr/bin/puppetmasterd + echo "Starting puppetmaster" + start-stop-daemon --start --quiet \ + --pidfile $pidfile \ + --exec /usr/bin/puppetmasterd -- $options if [ "$?" != "0" ]; then echo "Failed to start puppetmaster" fi @@ -13,7 +16,7 @@ puppetmaster_start() { puppetmaster_stop() { echo "Stopping puppetmaster" start-stop-daemon --stop --quiet \ - --pidfile "/var/run/puppet/puppetmasterd.pid" + --pidfile $pidfile if [ "$?" != "0" ]; then echo "Failed to stop puppetmaster" fi |