From a2bd4ca7da5a1658635e8e9d3bf4125a510fbc9d Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Date: Mon, 29 Jun 2009 00:51:15 +0000
Subject: puppet: adding initscript ; openrc: addin openrc

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2222 370017ae-e619-0410-ac65-c121f96126d4
---
 app/admin/puppet/Manifest            | 34 ++++++++++++-----------
 app/admin/puppet/puppet.SlackBuild   | 52 ++++++++++++++++++++++++++++++++++--
 app/admin/puppet/rc.puppet.new       | 36 +++++++++++++++++++++++++
 app/admin/puppet/rc.puppetmaster.new | 36 +++++++++++++++++++++++++
 app/admin/puppet/slack-required      |  1 +
 5 files changed, 141 insertions(+), 18 deletions(-)
 create mode 100644 app/admin/puppet/rc.puppet.new
 create mode 100644 app/admin/puppet/rc.puppetmaster.new

(limited to 'app')

diff --git a/app/admin/puppet/Manifest b/app/admin/puppet/Manifest
index 92326920..40895377 100644
--- a/app/admin/puppet/Manifest
+++ b/app/admin/puppet/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA256
 
 DIST puppet-0.24.8.tgz 1099188 MD5 288d46dee00acad64d0f3ecc6d8ba6fa RMD160 edb187da9225c9faee9839a5d644b5c9c91f3d5f SHA1 a871aef6f3e8e060f5109bb022967066e32875be SHA256 9e9dcfdd26f96e0b0b4ca9bcfe6f473c679ff082a0cd7226c2058ae652d4fdc8 SHA512 bbcfb92c073cc20f2a74e923f79316e4bf829da26ad8b590563ac1cf9cda6fbc7eb541a2c0c26a527a66ee15a146d557833635a67efdaca3f8eccdf63b4d62a3
-MKBUILD puppet.mkbuild 5102 MD5 67060150a08c3e9726f1f970b18e0eb8 RMD160 5c75a8f38e23a9db64b02e6994415dcb65b18ffd SHA1 21c4370ce7dd38814b4c5f1093823ca5718ae877 SHA256 e02a968dd120f3bb8122f71a0298b26e169dd56452ebcec320d107f8c5880c0b SHA512 38a7cc7f3e43acc0248207a77d31c311b1b49aae30fbd3432bf831b52902cc200bb9cc2a063e9ffe164fa59b4149d78e2c8e63b8a62d57f5ae9f1692f4a5d194
-SLACK-REQUIRED slack-required 77 MD5 c261e8a266810189ab2c444e93e8624f RMD160 4b141917b369e14c46b9662539c8a21b5fd02579 SHA1 22f46430bfeed22a19074ccf899d969fdef49710 SHA256 e9f5a1fc29b38d789dbabf133ae87b4e06c3d8095aa2a911ae848e60a79c9ddf SHA512 1e30c4b29c0556555ec17d312c5d06d9caa17a43de89565a893713f4135cb50e14ba4eb0500bb1f9ca0e030b9c0af121e2d28652d6c8ea590f63f48ca3c8e850
-SLACKBUILD puppet.SlackBuild 6752 MD5 2e3b5a06df2db3935cfd96e9618b35bd RMD160 9449a328f970a30a436a9f96a11b8face1807bc8 SHA1 483c62ca43e29ee580360e9a6c726fb458cd8bea SHA256 23e4a8e5d9d824ea69de56469d3029aa064e0856d2d184079a8e76e3e3ca7ae6 SHA512 14919155761a4ce5c5e0aa7cc5e3495ca0b23de927f4236312dbd81f6de75cb39853921f230a7aba9c9b80cff6dc372951d627838e92cbf5211a8ea4f7d7508a
+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
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIcBAEBCAAGBQJKR8lHAAoJEEHL93ESzgeiPmIP/2xV+d7NKhlE+zfVmp5Jz+O8
-RRWdqnQqo0gtq7EGCQA5w8srzn1Y8LYu1f7bZeL2OM4Gq1v0RAzZHF5OihX1D9tO
-q3XuIsVwsOUqXsq+9v3uR4WIPc5mk+WTx15UkXvc8rLj+dsO/OSBljzYDY+W7loh
-ALOMLII+Hy1TWvsZEBv+/j3A+/6WSQ0SbJLEpkmU9dSfVQpkUMD24RWa0vcAeq4g
-u/UavIQ6n7/Il9ct3q3zvsJP94M/VV3gKe20dLGJxQLCZJ0tJxhfU7zePPsBi6DV
-fuEh58a9PgjyDvFfeEPUFs+WZ9GV26Sz623HjGUftrVdojrh40lLVw3uvVu1kELf
-7x/UtGE7U/RHyy7/X4gMD6MPNH5Ss3VQ7UJ1QVFQi6+9hzELV4sZEMl42LBeZtc6
-Ue+2Ezpn4QI4+08FIZc3XixZb9sugIf8dpLFxyZfJKBnUIufwjRVkGPfIzy/bWCT
-czWET+4KxQFSNFst6NfH7HZce8Scmdi8uVqEKdEkv6LRSW2o4awxqCKoviQ30T+1
-+K7sjXQzTDj+PymWoSngMUKMyVEiiX1Bq9BTy8/4sDpIS112a9Zj3WZxAGZ3lZB1
-1Q5rxhrtP4JHOFfEdkKx31bcLwyhudDzhjAUkxaAKiw9d0Kxd81rzERAboAOIely
-B3r+9QIg+Jvo0wW0/Rx5
-=/CLO
+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
 -----END PGP SIGNATURE-----
diff --git a/app/admin/puppet/puppet.SlackBuild b/app/admin/puppet/puppet.SlackBuild
index 85de6dc9..aa4ef57f 100644
--- a/app/admin/puppet/puppet.SlackBuild
+++ b/app/admin/puppet/puppet.SlackBuild
@@ -15,7 +15,7 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for puppet, by Silvio Rhatto
-# requires: facter 
+# requires: facter openrc 
 # tested: puppet-0.24.8
 # model: generic.mkSlackBuild $Rev: 805 $
 #
@@ -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:=1rha}
+BUILD=${BUILD:=2rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
@@ -161,6 +161,7 @@ cd "$PKG_SRC"
 
 # Build and install package
 ruby install.rb --destdir=$PKG || exit $ERROR_INSTALL
+mkdir -p /var/run/puppet /etc/puppet
 
 # Strip binaries
 ( cd "$PKG"
@@ -170,6 +171,10 @@ ruby install.rb --destdir=$PKG || exit $ERROR_INSTALL
     xargs strip --strip-unneeded 2> /dev/null
 )
 
+# Copy init scripts
+mkdir -p $PKG/etc/rc.d
+cp $CWD/rc.* $PKG/etc/rc.d/
+
 # Install documentation
 DOCS="CHANGELOG COPYING LICENSE README README.rst Rakefile"
 mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
@@ -203,6 +208,49 @@ puppet:
 puppet:
 EODESC
 
+# Add a post-installation script (doinst.sh)
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+cat << EOSCRIPT > "$PKG/install/doinst.sh"
+config() {
+  NEW="\$1"
+  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
+  OLD="\$(dirname \$NEW)/\$(basename \$OLD .sample)"
+  OLD="\$(dirname \$NEW)/\$(basename \$OLD .dist)"
+
+  # If there's no config file by that name, mv it over:
+  if [ ! -r \$OLD ]; then
+    mv \$NEW \$OLD
+  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm \$NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+mkgroup() {
+  GROUP="\$1"
+  if ! grep -qe "^\$GROUP:" etc/group; then
+    echo Creating group \$GROUP...
+    chroot . /usr/sbin/groupadd \$GROUP
+  fi
+}
+
+mkuser() {
+  USER="\$1"
+  if [ ! -z "\$2" ]; then
+    GROUP="\$2"
+  else
+    GROUP="\$USER"
+  fi
+  if ! grep -qe "^\$USER:" etc/passwd; then
+    echo Creating user \$USER...
+    chroot . /usr/sbin/useradd \$USER -g \$GROUP
+  fi
+}
+
+config etc/rc.d/rc.puppet.new ; config etc/rc.d/rc.puppetmaster.new; mkgroup puppet; mkuser puppet; chown puppet.puppet /var/run/puppet
+EOSCRIPT
+
 # Build the package
 cd "$PKG"
 mkdir -p $REPOS/$SLACKBUILD_PATH
diff --git a/app/admin/puppet/rc.puppet.new b/app/admin/puppet/rc.puppet.new
new file mode 100644
index 00000000..d9738c0d
--- /dev/null
+++ b/app/admin/puppet/rc.puppet.new
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+puppet_start() {
+	echo "Starting puppet"
+	start-stop-daemon --start --quiet \
+		--pidfile "/var/run/puppetd.pid" \
+		--exec /usr/bin/puppetd
+  if [ "$?" != "0" ]; then
+    echo "Failed to start puppet"
+  fi
+}
+
+puppet_stop() {
+  echo "Stopping puppet"
+  start-stop-daemon --stop --quiet \
+    --pidfile "/var/run/puppet/puppetd.pid"
+  if [ "$?" != "0" ]; then
+    echo "Failed to stop puppet"
+  fi
+  rm -f "/var/run/puppet/puppetd.pid"
+}
+
+case "$1" in
+'start')
+  puppet_start
+  ;;
+'stop')
+  puppet_stop
+  ;;
+'restart')
+  puppet_stop
+  puppet_start
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/app/admin/puppet/rc.puppetmaster.new b/app/admin/puppet/rc.puppetmaster.new
new file mode 100644
index 00000000..1217fbc6
--- /dev/null
+++ b/app/admin/puppet/rc.puppetmaster.new
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+puppetmaster_start() {
+	echo "Starting puppetmaster"
+	start-stop-daemon --start --quiet \
+		--pidfile "/var/run/puppetmasterd.pid" \
+		--exec /usr/bin/puppetmasterd
+  if [ "$?" != "0" ]; then
+    echo "Failed to start puppetmaster"
+  fi
+}
+
+puppetmaster_stop() {
+  echo "Stopping puppetmaster"
+  start-stop-daemon --stop --quiet \
+    --pidfile "/var/run/puppet/puppetmasterd.pid"
+  if [ "$?" != "0" ]; then
+    echo "Failed to stop puppetmaster"
+  fi
+  rm -f "/var/run/puppet/puppetmasterd.pid"
+}
+
+case "$1" in
+'start')
+  puppetmaster_start
+  ;;
+'stop')
+  puppetmaster_stop
+  ;;
+'restart')
+  puppetmaster_stop
+  puppetmaster_start
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
diff --git a/app/admin/puppet/slack-required b/app/admin/puppet/slack-required
index c8ca4a44..eba2d803 100644
--- a/app/admin/puppet/slack-required
+++ b/app/admin/puppet/slack-required
@@ -2,3 +2,4 @@
 #
 # dependency [condition] [version]]
 facter				
+openrc				
-- 
cgit v1.2.3