2.3.0

2 files changed, 28 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84d838e0aac1..f3ca478878c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Mar  3 13:07:59 UTC 2016
+# Thu Mar 17 13:02:25 UTC 2016
 pkgbase = puppetserver
 	pkgdesc = Server automation framework and application
-	pkgver = 2.2.1
-	pkgrel = 4
+	pkgver = 2.3.0
+	pkgrel = 1
 	url = https://docs.puppetlabs.com/puppetserver/latest/services_master_puppetserver.html
 	install = puppetserver.install
 	arch = any
@@ -25,8 +25,8 @@ pkgbase = puppetserver
 	backup = etc/puppetlabs/puppetserver/conf.d/webserver.conf
 	backup = etc/puppetlabs/puppetserver/logback.xml
 	backup = etc/puppetlabs/puppetserver/request-logging.xml
-	source = http://downloads.puppetlabs.com/puppet/puppetserver-2.2.1.tar.gz
-	md5sums = 044b0f0148dc8703ea0418c8ae51c6ad
+	source = http://downloads.puppetlabs.com/puppet/puppetserver-2.3.0.tar.gz
+	md5sums = 46cb661571833cce9dac85f032a6f70d
 
 pkgname = puppetserver
 
diff --git a/PKGBUILD b/PKGBUILD
index 7cb687a8b412..7cae048bb115 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
 
 pkgname=puppetserver
-pkgver=2.2.1
-pkgrel=4
+pkgver=2.3.0
+pkgrel=1
 pkgdesc="Server automation framework and application"
 arch=('any')
 url="https://docs.puppetlabs.com/puppetserver/latest/services_master_puppetserver.html"
@@ -22,7 +22,7 @@ backup=('etc/default/puppetserver'
         'etc/puppetlabs/puppetserver/request-logging.xml')
 install=$pkgname.install
 source=(http://downloads.puppetlabs.com/puppet/$pkgname-$pkgver.tar.gz)
-md5sums=('044b0f0148dc8703ea0418c8ae51c6ad')
+md5sums=('46cb661571833cce9dac85f032a6f70d')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -38,57 +38,33 @@ package() {
 
 _prefix=${_prefix:=/usr}
 _unitdir=${_unitdir:=/usr/lib/systemd/system}
-_datadir=${_datadir:=${_prefix}/share}
 _real_name=${_real_name:=puppetserver}
-_proj_datadir=${_proj_datadir:=${_datadir}/${_real_name}}
 _confdir=${_confdir:=/etc}
-_projconfdir=${_projconfdir:=${confdir}/puppetlabs/${_real_name}}
-# Application specific bin directory
-_bindir=${_bindir:=/opt/puppetlabs/server/apps/${_real_name}/bin}
-# User facing bin directory, expected to be added to interactive shell PATH
-_uxbindir=${_uxbindir:=/opt/puppetlabs/bin}
-# symlinks of server binaries
-_symbindir=${_symbindir:=/opt/puppetlabs/server/bin}
+_sysconfdir=/etc
+_app_bindir=${_bindir:=/opt/puppetlabs/server/apps/${_real_name}/bin}
+_sym_bindir=${_symbindir:=/opt/puppetlabs/server/bin}
 _app_prefix=${_app_prefix:=/opt/puppetlabs/server/apps/${_real_name}}
 _app_data=${_app_data:=/opt/puppetlabs/server/data/${_real_name}}
 _app_logdir=${_app_logdir:=/var/log/puppetlabs/${_real_name}}
-_defaultsdir=/etc/default
 
-    install -d -m 0755 "${pkgdir}${_app_prefix}"
-    install -d -m 0755 "${pkgdir}${_app_data}"
-    install -m 0644 puppet-server-release.jar "${pkgdir}${_app_prefix}"
-    install -m 0755 ext/ezbake-functions.sh "${pkgdir}${_app_prefix}"
-    install -m 0644 ext/ezbake.manifest "${pkgdir}${_app_prefix}"
-    install -d -m 0755 "${pkgdir}${_projconfdir}/conf.d"
-    install -m 0644 ext/config/conf.d/puppetserver.conf "${pkgdir}${_projconfdir}/conf.d/puppetserver.conf"
-    install -m 0644 ext/config/request-logging.xml "${pkgdir}${_projconfdir}/request-logging.xml"
-    install -m 0644 ext/config/logback.xml "${pkgdir}${_projconfdir}/logback.xml"
-    install -m 0644 ext/config/bootstrap.cfg "${pkgdir}${_projconfdir}/bootstrap.cfg"
-    install -m 0644 ext/config/conf.d/global.conf "${pkgdir}${_projconfdir}/conf.d/global.conf"
-    install -m 0644 ext/config/conf.d/web-routes.conf "${pkgdir}${_projconfdir}/conf.d/web-routes.conf"
-    install -m 0644 ext/config/conf.d/auth.conf "${pkgdir}${_projconfdir}/conf.d/auth.conf"
-    install -m 0644 ext/config/conf.d/webserver.conf "${pkgdir}${_projconfdir}/conf.d/webserver.conf"
-    install -d -m 0755 "${pkgdir}${_app_prefix}/scripts"
-    install -d -m 0755 "${pkgdir}${_app_prefix}/cli"
-    install -d -m 0755 "${pkgdir}${_app_prefix}/cli/apps"
-    install -d -m 0755 "${pkgdir}${_bindir}"
-    install -m 0755 "ext/bin/${_real_name}" "${pkgdir}${_bindir}/${_real_name}"
-    install -d -m 0755 "${pkgdir}${_symbindir}"
-    ln -s "../apps/${_real_name}/bin/${_real_name}" "${pkgdir}${_symbindir}/${_real_name}"
-    install -d -m 0755 "${pkgdir}${_uxbindir}"
-    ln -s "../server/apps/${_real_name}/bin/${_real_name}" "${pkgdir}${_uxbindir}/${_real_name}"
+  env EZ_VERBOSE=1 DESTDIR="$pkgdir" prefix=${_prefix} \
+    app_prefix=${_app_prefix} app_data=${_app_data} \
+    confdir=${_sysconfdir} bindir=${_app_bindir} symbindir=${_sym_bindir} \
+    rundir=${_app_rundir} rubylibdir=${rubylibdir} \
+    bash install.sh install_redhat
+
+  env EZ_VERBOSE=1 DESTDIR="$pkgdir" prefix=${_prefix} \
+    app_prefix=${_app_prefix} app_data=${_app_data} \
+    confdir=${_sysconfdir} bindir=${_app_bindir} \
+    symbindir=${_sym_bindir} rundir=${_app_rundir} \
+    defaultsdir=${_sysconfdir}/default unitdir=${_unitdir} \
+    bash install.sh systemd_redhat
+
+  env EZ_VERBOSE=1 DESTDIR="$pkgdir" confdir=${_sysconfdir} \
+    bash install.sh logrotate
+
     install -d -m 0755 "${pkgdir}/usr/bin"
     ln -s "${_symbindir}/${_real_name}" "$pkgdir/usr/bin/${_real_name}"
-    install -m 0755 ext/cli/irb "${pkgdir}${_app_prefix}/cli/apps/irb"
-    install -m 0755 ext/cli/foreground "${pkgdir}${_app_prefix}/cli/apps/foreground"
-    install -m 0755 ext/cli/gem "${pkgdir}${_app_prefix}/cli/apps/gem"
-    install -m 0755 ext/cli/ruby "${pkgdir}${_app_prefix}/cli/apps/ruby"
-    install -d -m 750 "${pkgdir}${_app_logdir}"
-    install -d -m 0755 "${pkgdir}${_defaultsdir}"
-    install -m 0644 ext/default "${pkgdir}${_defaultsdir}/puppetserver"
-    install -d -m 0755 "${pkgdir}${_unitdir}"
-    install -m 0644 ext/redhat/puppetserver.service "${pkgdir}${_unitdir}/puppetserver.service"
     install -d "$pkgdir"/opt/puppetlabs/server/data/puppetserver/jruby-gems
-    install -d -m 0755 "${pkgdir}${_confdir}/logrotate.d"
-    install ext/puppetserver.logrotate.conf "${pkgdir}${_confdir}/logrotate.d/puppetserver"
+    rm -r "$pkgdir"/var/run
 }