cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/puppetserver: Update to 2.7.1

Browse Source 
While here, update MAINTAINER address

PR:		215053
Submitted by:	Zach Leslie <freebsd@zleslie.info> (maintainer)
This commit is contained in:
Steve Wills 2016-12-08 17:41:39 +00:00
parent eb96de0656
commit e5382cf2c7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=428145
8 changed files with 87 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sysutils/puppetserver/Makefile
View File

@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= puppetserver
PORTVERSION= 2.4.0
PORTVERSION= 2.7.1
CATEGORIES= sysutils java
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
MAINTAINER= xaque208@gmail.com
MAINTAINER= freebsd@zleslie.info
COMMENT= Puppet Server running in the JVM
LICENSE= APACHE20
@ -44,14 +44,17 @@ CFACTER_BUILD_DEPENDS= facter>=3.0:sysutils/facter
CFACTER_RUN_DEPENDS= facter>=3.0:sysutils/facter
post-patch:
.for file in ext/config/bootstrap.cfg ext/config/logback.xml \
ext/config/request-logging.xml \
.for file in ext/config/logback.xml ext/config/request-logging.xml \
ext/config/conf.d/global.conf ext/config/conf.d/puppetserver.conf \
ext/config/conf.d/web-routes.conf ext/config/conf.d/webserver.conf \
ext/config/conf.d/auth.conf
ext/config/conf.d/auth.conf ext/config/services.d/ca.cfg \
ext/system-config/services.d/bootstrap.cfg ext/bin/puppetserver
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
@${REINPLACE_CMD} -e "s|%%RUBY_SITELIBDIR%%|${RUBY_SITELIBDIR}|" ${WRKSRC}/${file}
@${REINPLACE_CMD} -e "s|%%RUBY_VER%%|${RUBY_VER}|" ${WRKSRC}/${file}
@${REINPLACE_CMD} -e "s|%%JAVA%%|${JAVA}|" ${WRKSRC}/${file}
@${REINPLACE_CMD} -e "s|%%ETCDIR%%|${ETCDIR}|" ${WRKSRC}/${file}
@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/${file}
.endfor
do-install:
@ -60,17 +63,22 @@ do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps
@${MKDIR} ${STAGEDIR}${ETCDIR}
@${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
@${MKDIR} ${STAGEDIR}${ETCDIR}/services.d
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code
@${MKDIR} ${STAGEDIR}${PREFIX}/bin
@${MKDIR} ${STAGEDIR}/var/log/puppetserver
${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppetserver.jar
@${MKDIR} ${STAGEDIR}/var/puppet/server
${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar
${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample
${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample
${INSTALL_DATA} ${WRKSRC}/ext/config/bootstrap.cfg ${STAGEDIR}${ETCDIR}/bootstrap.cfg.sample
${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml.sample
${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf.sample
${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf.sample
${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf.sample
${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf.sample
${INSTALL_DATA} ${WRKSRC}/ext/config/services.d/ca.cfg ${STAGEDIR}${ETCDIR}/services.d/ca.cfg.sample
${INSTALL_DATA} ${WRKSRC}/ext/system-config/services.d/bootstrap.cfg ${STAGEDIR}${ETCDIR}/services.d/bootstrap.cfg.sample
${INSTALL_DATA} ${WRKSRC}/ext/bin/puppetserver ${STAGEDIR}${PREFIX}/bin/puppetserver
${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground
${INSTALL_DATA} ${WRKSRC}/ext/cli/gem ${STAGEDIR}${DATADIR}/cli/apps/gem
${INSTALL_DATA} ${WRKSRC}/ext/cli/irb ${STAGEDIR}${DATADIR}/cli/apps/irb

4
sysutils/puppetserver/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1465154007
SHA256 (puppetserver-2.4.0.tar.gz) = 81d574f7483760bd70cafc079486fe14d243137612f0c130069d94ba7d4fded4
SIZE (puppetserver-2.4.0.tar.gz) = 33822659
SHA256 (puppetserver-2.7.1.tar.gz) = 9e2ad86fedb719e824d42055383dbbbb4f66c621e21c4c285e70b5c1dbc158c0
SIZE (puppetserver-2.7.1.tar.gz) = 33989388

21
sysutils/puppetserver/files/patch-ext__bin__puppetserver Normal file
View File

@ -0,0 +1,21 @@
--- ext/bin/puppetserver.orig 2016-10-09 11:15:40.432509250 -0700
+++ ext/bin/puppetserver 2016-10-09 11:17:08.987503108 -0700
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
set -a
if [ -r "/etc/default/puppetserver" ] ; then
@@ -11,6 +11,12 @@
USER="_puppet"
INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver"
CONFIG="/etc/puppetlabs/puppetserver/conf.d"
+elif [ `uname` == "FreeBSD" ] ; then
+ JAVA_BIN="%%JAVA%%"
+ JAVA_ARGS="-Xms2g -Xmx2g -XX:MaxPermSize=256m"
+ USER="puppet"
+ INSTALL_DIR="%%DATADIR%%"
+ CONFIG="%%ETCDIR%%/conf.d"
else
echo "You seem to be missing some important configuration files; could not find /etc/default/puppetserver or /etc/sysconfig/puppetserver" >&2
exit 1

23
sysutils/puppetserver/files/patch-ext__config__conf.d__puppetserver.conf
View File

@ -1,23 +1,28 @@
--- ext/config/conf.d/puppetserver.conf.orig 2015-10-27 17:03:52 UTC
+++ ext/config/conf.d/puppetserver.conf
@@ -2,11 +2,14 @@
jruby-puppet: {
--- ext/config/conf.d/puppetserver.conf.orig 2016-12-03 22:18:13.317251433 -0800
+++ ext/config/conf.d/puppetserver.conf 2016-12-03 22:28:31.518802507 -0800
@@ -3,15 +3,19 @@
# Where the puppet-agent dependency places puppet, facter, etc...
# Puppet server expects to load Puppet from this location
- ruby-load-path: [/opt/puppetlabs/puppet/lib/ruby/vendor_ruby]
ruby-load-path: [/opt/puppetlabs/puppet/lib/ruby/vendor_ruby]
+ ruby-load-path: [
+ %%RUBY_SITELIBDIR%%,
+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.4.4/lib/,
+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.4.6/lib,
+ ]
# This setting determines where JRuby will look for gems. It is also
# used by the `puppetserver gem` command line tool.
# This setting determines where JRuby will install gems. It is used for loading gems,
# and also by the `puppetserver gem` command line tool.
- gem-home: /opt/puppetlabs/server/data/puppetserver/jruby-gems
+ gem-home: /var/puppet/server/data/puppetserver/jruby-gems
# This setting defines the complete "GEM_PATH" for jruby. If set, it should include
# the gem-home directory as well as any other directories that gems can be loaded
# from (including the vendored gems directory for gems that ship with puppetserver)
- gem-path: [${jruby-puppet.gem-home}, "/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems"]
+ gem-path: [${jruby-puppet.gem-home}, "/var/puppet/server/data/puppetserver/vendored-jruby-gems"]
# PLEASE NOTE: Use caution when modifying the below settings. Modifying
@@ -22,23 +25,23 @@
# these settings will change the value of the corresponding Puppet settings
@@ -26,23 +30,23 @@
# (optional) path to puppet conf dir; if not specified, will use
# /etc/puppetlabs/puppet

23
sysutils/puppetserver/files/patch-ext__config__request-logging.xml
View File

@ -1,10 +1,15 @@
--- ext/config/request-logging.xml.orig 2015-10-27 16:40:09 UTC
+++ ext/config/request-logging.xml
@@ -1,6 +1,6 @@
--- ext/config/request-logging.xml.orig 2016-12-03 22:32:37.248735656 -0800
+++ ext/config/request-logging.xml 2016-12-03 22:37:39.489420010 -0800
@@ -1,10 +1,10 @@
<configuration debug="false" scan="true">
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <file>/var/log/puppetlabs/puppetserver/puppetserver-access.log</file>
+ <file>/var/log/puppetserver/puppetserver-access.log</file>
<encoder>
<pattern>%h %l %u %user %date "%r" %s %b %h %a %localPort %D</pattern>
</encoder>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>/var/log/puppetlabs/puppetserver/puppetserver-access.log</file>
+ <file>/var/log/puppetserver/puppetserver-access.log</file>
<append>true</append>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- rollover daily -->
- <fileNamePattern>/var/log/puppetlabs/puppetserver/puppetserver-access-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>/var/log/puppetserver/puppetserver-access-%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
<!-- each file should be at most 200MB, keep 90 days worth of history, but at most 1GB total-->
<maxFileSize>200MB</maxFileSize>
<maxHistory>90</maxHistory>

9
sysutils/puppetserver/files/pkg-message.in
View File

@ -1 +1,10 @@
Remember to add puppetserver_enable="YES" to rc.conf.
A note to users upgrading to 2.6 who have also modified bootstrap.cfg, please
see the release notes for breaking changes in 2.5.
https://docs.puppet.com/puppetserver/latest/release_notes.html#puppet-server-25
The file bootstrap.cfg has been removed and ca configuration has been moved out
to its own file in ca.cfg.

4
sysutils/puppetserver/files/puppetserver.in
View File

@ -45,7 +45,7 @@ rcvar=puppetserver_enable
load_rc_config "${name}"
: ${puppetserver_enable="NO"}
: ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/bootstrap.cfg"}
: ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/services.d"}
: ${puppetserver_java_home="%%JAVA_HOME%%"}
: ${puppetserver_user="puppet"}
: ${puppetserver_group="puppet"}
@ -55,7 +55,7 @@ pidfile="/var/run/puppetserver/puppetserver.pid"
command="/usr/sbin/daemon"
java_cmd="${puppetserver_java_home}/bin/java"
procname="${java_cmd}"
command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppetserver.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args} > ${puppetserver_log_file} 2>&1"
command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppet-server-release.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args} > ${puppetserver_log_file} 2>&1"
required_files="${java_cmd}"

16
sysutils/puppetserver/pkg-plist
View File

@ -1,15 +1,19 @@
@(,,750) bin/puppetserver
@sample %%ETCDIR%%/logback.xml.sample
@sample %%ETCDIR%%/bootstrap.cfg.sample
@sample %%ETCDIR%%/request-logging.xml.sample
@sample %%ETCDIR%%/conf.d/auth.conf.sample
@sample %%ETCDIR%%/conf.d/global.conf.sample
@sample %%ETCDIR%%/conf.d/puppetserver.conf.sample
@sample %%ETCDIR%%/conf.d/web-routes.conf.sample
@sample %%ETCDIR%%/conf.d/webserver.conf.sample
@sample %%ETCDIR%%/services.d/bootstrap.cfg.sample
@sample %%ETCDIR%%/services.d/ca.cfg.sample
@dir(,puppet,750) etc/puppet/code
%%DATADIR%%/puppetserver.jar
%%DATADIR%%/cli/apps/foreground
%%DATADIR%%/cli/apps/gem
%%DATADIR%%/cli/apps/irb
%%DATADIR%%/cli/apps/ruby
%%DATADIR%%/puppet-server-release.jar
@(,,755) %%DATADIR%%/cli/apps/foreground
@(,,755) %%DATADIR%%/cli/apps/gem
@(,,755) %%DATADIR%%/cli/apps/irb
@(,,755) %%DATADIR%%/cli/apps/ruby
@dir(puppet,puppet,750) /var/log/puppetserver
@dir(puppet,puppet,755) /var/puppet
@dir(puppet,puppet,750) /var/puppet/server