Skip to content
Browse files

updated to 3.1.0

  • Loading branch information...
1 parent 5906107 commit b64ff303c94c15504aae011ec92bb7679b83a4f1 @aboe76 aboe76 committed with Jan 30, 2013
Showing with 45 additions and 78 deletions.
  1. +45 −34 puppet/PKGBUILD
  2. +0 −12 puppet/fileserver.conf
  3. +0 −32 puppet/puppet.conf
View
79 puppet/PKGBUILD
@@ -9,77 +9,88 @@
# RC style, reserved for later use
#pkgname=puppet
-#_rc=8
-#_pkgver=3.0.0
+#_rc=2
+#_pkgver=3.1.0
#pkgver=${_pkgver}_rc${_rc}
pkgname=puppet
-pkgver=3.0.2
-pkgrel=7
+_gemname=puppet
+pkgver=3.1.0
+pkgrel=9
pkgdesc="A system for automating system administration tasks."
arch=("any")
url="http://puppetlabs.com/projects/puppet/"
license=("APACHE")
-depends=("ruby" "ruby-shadow" "facter" "ruby-hiera" "ruby-hiera-json")
+depends=("ruby" "ruby-shadow" "ruby-facter" "ruby-hiera" "ruby-hiera-json" "ruby-json_pure" "logrotate")
makedepends=('which')
backup=("etc/puppet/puppet.conf")
options=(emptydirs)
provides=("puppet" "vim-puppet" "ruby-hiera-puppet")
-conflicts=("puppet3" "ruby-puppet" "vim-puppet" "ruby-hiera-puppet")
+conflicts=("puppet3" "ruby-puppet" "vim-puppet")
install="puppet.install"
-source=(http://puppetlabs.com/downloads/puppet/puppet-${pkgver//_/-}.tar.gz
- fileserver.conf
- puppet
- puppet.conf
- puppetmaster)
-md5sums=('c4507a83679df9f6c8409d97cc6ef757'
- 'ffacd9bfb9c7656a3a345dbc5eb0e67a'
+source=(
+ "http://gems.rubyforge.org/gems/${_gemname}-${pkgver}.gem"
+ "http://gems.rubyforge.org/gems/hiera-1.0.0.gem"
+ "puppet"
+ "puppetmaster")
+md5sums=(
+ '1e9fc8e751e9c3728411c7ba46030071'
+ '3913fc038e1d111788c68c2733863155'
'59dbf39e251bc4877e7604a5876c642d'
- 'a7d61d20e46b411eb50ad5279987584a'
'4c507c580cb28d7a5adc9ea6b3626657')
+ #'bc1a9e9ebf3504e2198e11aaef818d97' # 3.0.2
+ #'26f65f5d7a8cef9ead14ee87aec159e1' # 3.0.2.rc2
+ #'1e9fc8e751e9c3728411c7ba46030071' # 3.1.0
+noextract=(${_gemname}-${pkgver}.gem)
package() {
- cd $srcdir/puppet-${pkgver//_/-}
-
- # Install
- ruby ./install.rb \
- --destdir=$pkgdir \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --mandir=/usr/share/man
+ cd "$srcdir"
+ # _gemdir is defined inside package() because if ruby[gems] is not installed on
+ # the system, makepkg will exit with an error when sourcing the PKGBUILD.
+ local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+ gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" \
+ --no-ri --no-rdoc -n "$pkgdir/usr/bin" "{$_gemname}-${pkgver}.gem" "hiera-1.0.0.gem"
# Set up vim and emacs
- install -Dp -m0644 ext/vim/ftdetect/puppet.vim $pkgdir/usr/share/vim/vimfiles/ftdetect/puppet.vim
- install -Dp -m0644 ext/vim/syntax/puppet.vim $pkgdir/usr/share/vim/vimfiles/syntax/puppet.vim
- install -Dp -m0644 ext/emacs/puppet-mode.el $pkgdir/usr/share/emacs/site-lisp/puppet-mode.el
- install -Dp -m0644 ext/emacs/puppet-mode-init.el $pkgdir/usr/share/emacs/site-lisp/site-start.d/puppet-mode-init.el
+ install -Dp -m0644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/ext/vim/ftdetect/puppet.vim $pkgdir/usr/share/vim/vimfiles/ftdetect/puppet.vim
+ install -Dp -m0644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/ext/vim/syntax/puppet.vim $pkgdir/usr/share/vim/vimfiles/syntax/puppet.vim
+ install -Dp -m0644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/ext/emacs/puppet-mode.el $pkgdir/usr/share/emacs/site-lisp/puppet-mode.el
+ install -Dp -m0644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/ext/emacs/puppet-mode-init.el $pkgdir/usr/share/emacs/site-lisp/site-start.d/puppet-mode-init.el
# Configuration and rc scripts
- install -d $pkgdir/etc/{puppet,rc.d}
- install -m 644 $srcdir/puppet.conf $pkgdir/etc/puppet/puppet.conf
- install -m 644 $srcdir/fileserver.conf $pkgdir/etc/puppet/fileserver.conf
+ #install -d $pkgdir/etc/{puppet,rc.d}
+ install -Dm 644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/ext/redhat/puppet.conf $pkgdir/etc/puppet/puppet.conf
+ install -Dm 644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/conf/fileserver.conf $pkgdir/etc/puppet/fileserver.conf
+ install -Dm 644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/conf/auth.conf $pkgdir/etc/puppet/auth.conf
+ install -Dm 644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/conf/tagmail.conf $pkgdir/etc/puppet/tagmail.conf
+ install -Dm 644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/ext/redhat/puppet.conf $pkgdir/etc/puppet/puppet.conf
# Setup tmpfiles.d config
install -d $pkgdir/etc/tmpfiles.d
echo "D /var/run/puppet 0755 puppet puppet -" > $pkgdir/etc/tmpfiles.d/puppet.conf
+ # Logrotate
+ install -Dm 644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/ext/redhat/logrotate $pkgdir/etc/logrotate.d/puppet
+
# Configuration for hiera / symlink is there to use hiera within puppet.
ln -snf /etc/hiera.yaml ${pkgdir}/etc/puppet/hiera.yaml
# Systemd files
- install -Dm 644 $srcdir/puppet-${pkgver//_/-}/ext/systemd/puppetagent.service $pkgdir/usr/lib/systemd/system/puppetagent.service
- install -Dm 644 $srcdir/puppet-${pkgver//_/-}/ext/systemd/puppetmaster.service $pkgdir/usr/lib/systemd/system/puppetmaster.service
+ install -Dm 644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/ext/systemd/puppetagent.service $pkgdir/usr/lib/systemd/system/puppet.service
+ install -Dm 644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/ext/systemd/puppetmaster.service $pkgdir/usr/lib/systemd/system/puppetmaster.service
# Create puppet homedir and hieradir
install -d $pkgdir/var/lib/puppet
install -d $pkgdir/var/lib/hiera
+ # Init Scripts
install -D $srcdir/puppet $pkgdir/etc/rc.d/puppet
install -D $srcdir/puppetmaster $pkgdir/etc/rc.d/puppetmaster
- # Copy the LICENSE file in the usual directory
- install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m 644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ # Compress and install man pages
+ install -d $pkgdir/usr/share/man
+ mv $pkgdir/usr/lib/ruby/gems/1.9.1/gems/$_gemname-$pkgver/man/* $pkgdir/usr/share/man
+ gzip -9 -q -r $pkgdir/usr/share/man
}
View
12 puppet/fileserver.conf
@@ -1,12 +0,0 @@
-# This file consists of arbitrarily named sections/modules
-# defining where files are served from and to whom
-
-# Define a section 'files'
-# Adapt the allow/deny settings to your needs. Order
-# for allow/deny does not matter, allow always takes precedence
-# over deny
-# [files]
-# path /var/lib/puppet/files
-# allow *.example.com
-# deny *.evil.example.com
-# allow 192.168.0.0/24
View
32 puppet/puppet.conf
@@ -1,32 +0,0 @@
-[main]
- # The Puppet var directory
- # The default value is '/var/lib/puppet'
- vardir = /var/lib/puppet
-
- # The Puppet log directory.
- # The default value is '$vardir/log'.
- logdir = /var/log/puppet
-
- # Where Puppet PID files are kept.
- # The default value is '$vardir/run'.
- rundir = /var/run/puppet
-
- # Where SSL certificates are kept.
- # The default value is '$confdir/ssl'.
- pluginsync=true
-
-
-[agent]
- # The file in which puppetd stores a list of the classes
- # associated with the retrieved configuratiion. Can be loaded in
- # the separate ``puppet`` executable using the ``--loadclasses``
- # option.
- # The default value is '$confdir/classes.txt'.
- classfile = $vardir/classes.txt
-
- # Where puppetd caches the local configuration. An
- # extension indicating the cache format is added automatically.
- # The default value is '$confdir/localconfig'.
- localconfig = $vardir/localconfig
-
-#[master]

0 comments on commit b64ff30

Please sign in to comment.
Something went wrong with that request. Please try again.