[arch-commits] Commit in puppet/trunk (PKGBUILD puppetmaster.service)

[Jonathan Steel]

    Date: Wednesday, June 24, 2015 @ 17:14:15
  Author: jsteel
Revision: 135827

upgpkg: puppet 4.2.0-1

Added:
  puppet/trunk/puppetmaster.service
Modified:
  puppet/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   12 ++++++++----
 puppetmaster.service |   11 +++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-24 12:11:57 UTC (rev 135826)
+++ PKGBUILD	2015-06-24 15:14:15 UTC (rev 135827)
@@ -9,7 +9,7 @@
 # Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
 
 pkgname=puppet
-pkgver=4.1.0
+pkgver=4.2.0
 pkgrel=1
 pkgdesc="Server automation framework and application"
 arch=('any')
@@ -21,8 +21,10 @@
         'etc/puppetlabs/puppet/fileserver.conf'
         'etc/puppetlabs/puppet/puppet.conf')
 install=$pkgname.install
-source=($pkgname-$pkgver.tar.gz::http://github.com/puppetlabs/$pkgname/archive/$pkgver.tar.gz)
-md5sums=('8bc08d5edf528678291336661cd9a0fd')
+source=($pkgname-$pkgver.tar.gz::http://github.com/puppetlabs/$pkgname/archive/$pkgver.tar.gz
+        puppetmaster.service)
+md5sums=('71b7d749da9abd36ea7af29d481fe081'
+         '23ef9536a87288402b57b2b500b9385a')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -50,7 +52,7 @@
   # systemd
   install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/systemd/$pkgname.service \
     "$pkgdir"/usr/lib/systemd/system/$pkgname.service
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/systemd/${pkgname}master.service \
+  install -Dm644 "$srcdir"/puppetmaster.service \
     "$pkgdir"/usr/lib/systemd/system/${pkgname}master.service
 
   # vim and emacs
@@ -64,4 +66,6 @@
     "$pkgdir"/usr/share/emacs/site-lisp/site-start.d/$pkgname-mode-init.el
 
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+  rm -r "$pkgdir"/run
 }

Added: puppetmaster.service
===================================================================
--- puppetmaster.service	                        (rev 0)
+++ puppetmaster.service	2015-06-24 15:14:15 UTC (rev 135827)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Puppet master
+Wants=basic.target
+After=basic.target network.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/puppetmaster
+ExecStart=/usr/bin/puppet master $PUPPETMASTER_EXTRA_OPTS --no-daemonize
+
+[Install]
+WantedBy=multi-user.target