Date: Thursday, January 11, 2018 @ 04:39:53 Author: eschwartz Revision: 281213
archrelease: copy trunk to community-any Added: puppet/repos/community-any/PKGBUILD (from rev 281212, puppet/trunk/PKGBUILD) puppet/repos/community-any/puppet.install (from rev 281212, puppet/trunk/puppet.install) Deleted: puppet/repos/community-any/PKGBUILD puppet/repos/community-any/puppet.install ----------------+ PKGBUILD | 111 +++++++++++++++++++++++++++---------------------------- puppet.install | 25 ++---------- 2 files changed, 61 insertions(+), 75 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-01-11 04:39:33 UTC (rev 281212) +++ PKGBUILD 2018-01-11 04:39:53 UTC (rev 281213) @@ -1,55 +0,0 @@ -# $Id$ -# Maintainer: Jonathan Steel <jsteel at archlinux.org> -# Contributor: Greg Sutcliffe <puppet-aur (at) emeraldreverie (dot) org> -# Contributor: Hyacinthe Cartiaux <hyacinthe (dot) cartiaux (at) free (dot) fr> -# Contributor: Thomas S Hatch <thatch45 (at) Gmail (dot) com> -# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com> -# Contributor: Miah Johnson <miah (at) chia-pet dot org> -# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com> -# Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com> - -pkgname=puppet -pkgver=5.3.3 -pkgrel=2 -pkgdesc="Server automation framework and application" -arch=('any') -url="http://puppetlabs.com/puppet/puppet-open-source" -license=('Apache') -depends=('facter' 'hiera') -optdepends=('ruby-shadow: user password management') -backup=('etc/puppetlabs/puppet/auth.conf' - 'etc/puppetlabs/puppet/puppet.conf') -install=$pkgname.install -source=(https://downloads.puppetlabs.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('d6ea48672608cad865960cf4be4b86da') - -prepare() { - cd $pkgname-$pkgver - - # FS#45044: fix file location - sed -i 's_/opt/puppetlabs/puppet_/usr_' ext/systemd/puppet.service -} - -package() { - cd $pkgname-$pkgver - - ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e \ - 'puts RbConfig::CONFIG["vendorlibdir"]' )" - - install -d "$pkgdir"/{var/lib/$pkgname,usr/lib/tmpfiles.d} - - echo "d /run/puppetlabs 0755 $pkgname $pkgname -" > \ - "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf - - # systemd - install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/systemd/$pkgname.service \ - "$pkgdir"/usr/lib/systemd/system/$pkgname.service - - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - - # Match permissions that puppet sets when running - chmod 775 "$pkgdir"/var/lib/puppet - chmod 750 "$pkgdir"/var/log/puppetlabs/puppet - - rm -r "$pkgdir"/var/run -} Copied: puppet/repos/community-any/PKGBUILD (from rev 281212, puppet/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-01-11 04:39:53 UTC (rev 281213) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Jonathan Steel <jsteel at archlinux.org> +# Contributor: Greg Sutcliffe <puppet-aur (at) emeraldreverie (dot) org> +# Contributor: Hyacinthe Cartiaux <hyacinthe (dot) cartiaux (at) free (dot) fr> +# Contributor: Thomas S Hatch <thatch45 (at) Gmail (dot) com> +# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com> +# Contributor: Miah Johnson <miah (at) chia-pet dot org> +# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com> +# Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com> + +pkgname=puppet +pkgver=5.3.3 +pkgrel=3 +pkgdesc="Server automation framework and application" +arch=('any') +url="https://puppet.com/products/open-source-projects" +license=('Apache') +depends=('facter' 'hiera') +optdepends=('ruby-shadow: user password management') +backup=('etc/puppetlabs/puppet/auth.conf' + 'etc/puppetlabs/puppet/puppet.conf') +install=$pkgname.install +source=(https://downloads.puppetlabs.com/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('d6ea48672608cad865960cf4be4b86da') + +prepare() { + cd $pkgname-$pkgver + + # FS#45044: fix file location + sed -i 's_/opt/puppetlabs/puppet_/usr_' ext/systemd/puppet.service +} + +package() { + cd $pkgname-$pkgver + + ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e \ + 'puts RbConfig::CONFIG["vendorlibdir"]' )" + + echo 'u puppet 52 "Puppet" /var/lib/puppet' | install -Dm644 \ + /dev/stdin "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf + + echo "d /run/puppetlabs 0755 $pkgname $pkgname -" | install -Dm644 \ + /dev/stdin "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf + + # systemd + install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/systemd/$pkgname.service \ + "$pkgdir"/usr/lib/systemd/system/$pkgname.service + + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + + # Match permissions that puppet sets when running + install -dm775 "$pkgdir"/var/lib/puppet + chmod 750 "$pkgdir"/var/log/puppetlabs/puppet + + rm -r "$pkgdir"/var/run +} Deleted: puppet.install =================================================================== --- puppet.install 2018-01-11 04:39:33 UTC (rev 281212) +++ puppet.install 2018-01-11 04:39:53 UTC (rev 281213) @@ -1,20 +0,0 @@ -pre_install() { - getent group puppet &>/dev/null || groupadd -r puppet -g 52 - getent passwd puppet &>/dev/null || useradd -r -u 52 -g puppet \ - -d /var/lib/puppet -s /usr/bin/nologin -c "Puppet" puppet -} - -pre_upgrade() { - pre_install - - # 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 -} Copied: puppet/repos/community-any/puppet.install (from rev 281212, puppet/trunk/puppet.install) =================================================================== --- puppet.install (rev 0) +++ puppet.install 2018-01-11 04:39:53 UTC (rev 281213) @@ -0,0 +1,5 @@ +pre_remove() { + if [[ -f /run/puppetlabs/agent.pid ]]; then + systemctl stop puppet + fi +}