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

[Jonathan Steel]

    Date: Tuesday, September 15, 2015 @ 12:44:47
  Author: jsteel
Revision: 140327

upgpkg: puppet 4.2.2-1

Modified:
  puppet/trunk/PKGBUILD
  puppet/trunk/puppet.install
Deleted:
  puppet/trunk/puppetmaster.service

----------------------+
 PKGBUILD             |   16 +++-------------
 puppet.install       |   10 +++++-----
 puppetmaster.service |   11 -----------
 3 files changed, 8 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-15 10:41:59 UTC (rev 140326)
+++ PKGBUILD	2015-09-15 10:44:47 UTC (rev 140327)
@@ -9,7 +9,7 @@
 # Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
 
 pkgname=puppet
-pkgver=4.2.1
+pkgver=4.2.2
 pkgrel=1
 pkgdesc="Server automation framework and application"
 arch=('any')
@@ -18,13 +18,10 @@
 depends=('facter' 'hiera')
 optdepends=('ruby-shadow: user password management')
 backup=('etc/puppetlabs/puppet/auth.conf'
-        'etc/puppetlabs/puppet/fileserver.conf'
         'etc/puppetlabs/puppet/puppet.conf')
 install=$pkgname.install
-source=(https://downloads.puppetlabs.com/$pkgname/$pkgname-$pkgver.tar.gz
-        puppetmaster.service)
-md5sums=('ec058dd9ac38dce720a9248fea23a98b'
-         '23ef9536a87288402b57b2b500b9385a')
+source=(https://downloads.puppetlabs.com/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('af37da0c7cc25ee3fcfc3914059249df')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -39,21 +36,14 @@
   ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e \
     'puts RbConfig::CONFIG["vendorlibdir"]' )"
 
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/conf/fileserver.conf \
-    "$pkgdir"/etc/puppetlabs/$pkgname/fileserver.conf
-
   install -d "$pkgdir"/{var/lib/$pkgname,usr/lib/tmpfiles.d}
 
   echo "d /run/puppetlabs 0755 $pkgname $pkgname -" > \
     "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
 
-  chmod 750 "$pkgdir"/var/log/puppetlabs/puppet
-
   # systemd
   install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/systemd/$pkgname.service \
     "$pkgdir"/usr/lib/systemd/system/$pkgname.service
-  install -Dm644 "$srcdir"/puppetmaster.service \
-    "$pkgdir"/usr/lib/systemd/system/${pkgname}master.service
 
   # vim and emacs
   install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/vim/ftdetect/$pkgname.vim \

Modified: puppet.install
===================================================================
--- puppet.install	2015-09-15 10:41:59 UTC (rev 140326)
+++ puppet.install	2015-09-15 10:44:47 UTC (rev 140327)
@@ -4,20 +4,20 @@
     -d /var/lib/puppet -s /usr/bin/nologin -c "Puppet" puppet
 
   echo '==> Upstream have removed the puppetmaster.service file in
-==> preparation for version 5 where "puppet master" will be deprecated. We
-==> will remove the service file on the next update; you should migrate
-==> your puppet masters to puppetserver'
+==> preparation for version 5 where "puppet master" will be deprecated.
+==> You should migrate your puppet masters to puppetserver.'
 }
 
 pre_upgrade() {
   pre_install
-}
 
-pre_remove() {
+  # puppetmaster has been dropped
   if [[ -f /run/puppetlabs/master.pid ]]; then
     systemctl stop puppetmaster
   fi
+}
 
+pre_remove() {
   if [[ -f /run/puppetlabs/agent.pid ]]; then
     systemctl stop puppet
   fi

Deleted: puppetmaster.service
===================================================================
--- puppetmaster.service	2015-09-15 10:41:59 UTC (rev 140326)
+++ puppetmaster.service	2015-09-15 10:44:47 UTC (rev 140327)
@@ -1,11 +0,0 @@
-[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