[arch-commits] Commit in puppet/repos/community-testing-any (4 files)
Jonathan Steel
jsteel at archlinux.org
Mon Apr 20 16:49:46 UTC 2015
Date: Monday, April 20, 2015 @ 18:49:46
Author: jsteel
Revision: 131754
archrelease: copy trunk to community-testing-any
Added:
puppet/repos/community-testing-any/PKGBUILD
(from rev 131753, puppet/trunk/PKGBUILD)
puppet/repos/community-testing-any/puppet.install
(from rev 131753, puppet/trunk/puppet.install)
Deleted:
puppet/repos/community-testing-any/PKGBUILD
puppet/repos/community-testing-any/puppet.install
----------------+
PKGBUILD | 122 +++++++++++++++++++++++++++----------------------------
puppet.install | 52 +++++++++++------------
2 files changed, 86 insertions(+), 88 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-04-20 16:49:35 UTC (rev 131753)
+++ PKGBUILD 2015-04-20 16:49:46 UTC (rev 131754)
@@ -1,62 +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=4.0.0
-pkgrel=1
-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'
- 'logrotate')
-backup=('etc/puppetlabs/puppet/auth.conf'
- 'etc/puppetlabs/puppet/fileserver.conf'
- 'etc/puppetlabs/puppet/puppet.conf'
- 'etc/logrotate.d/puppet')
-install=$pkgname.install
-source=($pkgname-$pkgver.tar.gz::http://github.com/puppetlabs/$pkgname/archive/$pkgver.tar.gz)
-md5sums=('fe40c3d9a9845155df083c411f39d943')
-
-package() {
- cd $pkgname-$pkgver
-
- ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e \
- 'puts RbConfig::CONFIG["vendorlibdir"]' )" --rundir=/run
-
- install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/redhat/logrotate \
- "$pkgdir"/etc/logrotate.d/$pkgname
- 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
-
- # 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 \
- "$pkgdir"/usr/lib/systemd/system/${pkgname}master.service
-
- # vim and emacs
- install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/vim/ftdetect/$pkgname.vim \
- "$pkgdir"/usr/share/vim/vimfiles/ftdetect/$pkgname.vim
- install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/vim/syntax/$pkgname.vim \
- "$pkgdir"/usr/share/vim/vimfiles/syntax/$pkgname.vim
- install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/emacs/$pkgname-mode.el \
- "$pkgdir"/usr/share/emacs/site-lisp/$pkgname-mode.el
- install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/emacs/$pkgname-mode-init.el \
- "$pkgdir"/usr/share/emacs/site-lisp/site-start.d/$pkgname-mode-init.el
-
- install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: puppet/repos/community-testing-any/PKGBUILD (from rev 131753, puppet/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-04-20 16:49:46 UTC (rev 131754)
@@ -0,0 +1,60 @@
+# $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=4.0.0
+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/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=('fe40c3d9a9845155df083c411f39d943')
+
+package() {
+ cd $pkgname-$pkgver
+
+ ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e \
+ 'puts RbConfig::CONFIG["vendorlibdir"]' )" --rundir=/run
+
+ 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"/$pkgname-$pkgver/ext/systemd/${pkgname}master.service \
+ "$pkgdir"/usr/lib/systemd/system/${pkgname}master.service
+
+ # vim and emacs
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/vim/ftdetect/$pkgname.vim \
+ "$pkgdir"/usr/share/vim/vimfiles/ftdetect/$pkgname.vim
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/vim/syntax/$pkgname.vim \
+ "$pkgdir"/usr/share/vim/vimfiles/syntax/$pkgname.vim
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/emacs/$pkgname-mode.el \
+ "$pkgdir"/usr/share/emacs/site-lisp/$pkgname-mode.el
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/emacs/$pkgname-mode-init.el \
+ "$pkgdir"/usr/share/emacs/site-lisp/site-start.d/$pkgname-mode-init.el
+
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: puppet.install
===================================================================
--- puppet.install 2015-04-20 16:49:35 UTC (rev 131753)
+++ puppet.install 2015-04-20 16:49:46 UTC (rev 131754)
@@ -1,26 +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
-
- if [ "$(vercmp 4 "$2")" -eq 1 ]; then
- echo '==> Version 4 beaks compatibility with version 3; you will need
-==> to follow upgrade instructions for your servers and clients:
-==> https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html
-==> https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html'
- fi
-}
-
-pre_remove() {
- if [[ -f /run/puppetlabs/master.pid ]]; then
- systemctl stop puppetmaster
- fi
-
- if [[ -f /run/puppetlabs/agent.pid ]]; then
- systemctl stop puppet
- fi
-}
Copied: puppet/repos/community-testing-any/puppet.install (from rev 131753, puppet/trunk/puppet.install)
===================================================================
--- puppet.install (rev 0)
+++ puppet.install 2015-04-20 16:49:46 UTC (rev 131754)
@@ -0,0 +1,26 @@
+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
+
+ if [ "$(vercmp 4 "$2")" -eq 1 ]; then
+ echo '==> Version 4 breaks compatibility with version 3; you will need
+==> to follow upgrade instructions for your servers and clients:
+==> https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html
+==> https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html'
+ fi
+}
+
+pre_remove() {
+ if [[ -f /run/puppetlabs/master.pid ]]; then
+ systemctl stop puppetmaster
+ fi
+
+ if [[ -f /run/puppetlabs/agent.pid ]]; then
+ systemctl stop puppet
+ fi
+}
More information about the arch-commits
mailing list