Attachment #177666 for bug #215053

View | Details | Raw Unified | Return to bug 215053
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	puppetserver
PORTVERSION=	2.7.1
CATEGORIES=	sysutils java
MASTER_SITES=	http://downloads.puppetlabs.com/puppet/

MAINTAINER=	freebsd@zleslie.info
COMMENT=	Puppet Server running in the JVM

LICENSE=	APACHE20

CFACTER_RUN_DEPENDS=	facter>=3.0:sysutils/facter

post-patch:
.for file in ext/config/logback.xml ext/config/request-logging.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/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:

	@${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
	@${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

Lines 1-3 Link Here

(-)distinfo (-2 / +2 lines)
1	TIMESTAMP = 1465154007	1	TIMESTAMP = 1465154007
2	SHA256 (puppetserver-2.4.0.tar.gz) = 81d574f7483760bd70cafc079486fe14d243137612f0c130069d94ba7d4fded4	2	SHA256 (puppetserver-2.7.1.tar.gz) = 9e2ad86fedb719e824d42055383dbbbb4f66c621e21c4c285e70b5c1dbc158c0
3	SIZE (puppetserver-2.4.0.tar.gz) = 33822659	3	SIZE (puppetserver-2.7.1.tar.gz) = 33989388




--- 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




--- 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 @@
 jruby-puppet: {
     # 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: [
+        %%RUBY_SITELIBDIR%%,
+        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.4.6/lib,
+    ]
 
     # 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
     # 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




--- 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.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>

Line 1 Link Here

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

Lines 45-51 Link Here

(-)files/puppetserver.in (-2 / +2 lines)
45	load_rc_config "${name}"	45	load_rc_config "${name}"
46		46
47	: ${puppetserver_enable="NO"}	47	: ${puppetserver_enable="NO"}
48	: ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/bootstrap.cfg"}	48	: ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/services.d"}
49	: ${puppetserver_java_home="%%JAVA_HOME%%"}	49	: ${puppetserver_java_home="%%JAVA_HOME%%"}
50	: ${puppetserver_user="puppet"}	50	: ${puppetserver_user="puppet"}
51	: ${puppetserver_group="puppet"}	51	: ${puppetserver_group="puppet"}
Lines 55-61 Link Here
55	command="/usr/sbin/daemon"	55	command="/usr/sbin/daemon"
56	java_cmd="${puppetserver_java_home}/bin/java"	56	java_cmd="${puppetserver_java_home}/bin/java"
57	procname="${java_cmd}"	57	procname="${java_cmd}"
58	command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppetserver.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args} > ${puppetserver_log_file} 2>&1"	58	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"
59		59
60		60
61	required_files="${java_cmd}"	61	required_files="${java_cmd}"

Lines 1-5 Link Here

(-)pkg-plist (-6 / +10 lines)
		1	@(,,750) bin/puppetserver
1	@sample %%ETCDIR%%/logback.xml.sample	2	@sample %%ETCDIR%%/logback.xml.sample
2	@sample %%ETCDIR%%/bootstrap.cfg.sample
3	@sample %%ETCDIR%%/request-logging.xml.sample	3	@sample %%ETCDIR%%/request-logging.xml.sample
4	@sample %%ETCDIR%%/conf.d/auth.conf.sample	4	@sample %%ETCDIR%%/conf.d/auth.conf.sample
5	@sample %%ETCDIR%%/conf.d/global.conf.sample	5	@sample %%ETCDIR%%/conf.d/global.conf.sample
Lines 6-15 Link Here
6	@sample %%ETCDIR%%/conf.d/puppetserver.conf.sample	6	@sample %%ETCDIR%%/conf.d/puppetserver.conf.sample
7	@sample %%ETCDIR%%/conf.d/web-routes.conf.sample	7	@sample %%ETCDIR%%/conf.d/web-routes.conf.sample
8	@sample %%ETCDIR%%/conf.d/webserver.conf.sample	8	@sample %%ETCDIR%%/conf.d/webserver.conf.sample
		9	@sample %%ETCDIR%%/services.d/bootstrap.cfg.sample
		10	@sample %%ETCDIR%%/services.d/ca.cfg.sample
9	@dir(,puppet,750) etc/puppet/code	11	@dir(,puppet,750) etc/puppet/code
10	%%DATADIR%%/puppetserver.jar	12	%%DATADIR%%/puppet-server-release.jar
11	%%DATADIR%%/cli/apps/foreground	13	@(,,755) %%DATADIR%%/cli/apps/foreground
12	%%DATADIR%%/cli/apps/gem	14	@(,,755) %%DATADIR%%/cli/apps/gem
13	%%DATADIR%%/cli/apps/irb	15	@(,,755) %%DATADIR%%/cli/apps/irb
14	%%DATADIR%%/cli/apps/ruby	16	@(,,755) %%DATADIR%%/cli/apps/ruby
15	@dir(puppet,puppet,750) /var/log/puppetserver	17	@dir(puppet,puppet,750) /var/log/puppetserver
		18	@dir(puppet,puppet,750) /var/puppet
		19	@dir(puppet,puppet,750) /var/puppet/server

Return to bug 215053

Lines 1-11 Link Here

(-)Makefile (-7 / +15 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= puppetserver	3	PORTNAME= puppetserver
4	PORTVERSION= 2.4.0	4	PORTVERSION= 2.7.1
5	CATEGORIES= sysutils java	5	CATEGORIES= sysutils java
6	MASTER_SITES= http://downloads.puppetlabs.com/puppet/	6	MASTER_SITES= http://downloads.puppetlabs.com/puppet/
7		7
8	MAINTAINER= xaque208@gmail.com	8	MAINTAINER= freebsd@zleslie.info
9	COMMENT= Puppet Server running in the JVM	9	COMMENT= Puppet Server running in the JVM
10		10
11	LICENSE= APACHE20	11	LICENSE= APACHE20
Lines 44-57 Link Here
44	CFACTER_RUN_DEPENDS= facter>=3.0:sysutils/facter	44	CFACTER_RUN_DEPENDS= facter>=3.0:sysutils/facter
45		45
46	post-patch:	46	post-patch:
47	.for file in ext/config/bootstrap.cfg ext/config/logback.xml \	47	.for file in ext/config/logback.xml ext/config/request-logging.xml \
48	ext/config/request-logging.xml \
49	ext/config/conf.d/global.conf ext/config/conf.d/puppetserver.conf \	48	ext/config/conf.d/global.conf ext/config/conf.d/puppetserver.conf \
50	ext/config/conf.d/web-routes.conf ext/config/conf.d/webserver.conf \	49	ext/config/conf.d/web-routes.conf ext/config/conf.d/webserver.conf \
51	ext/config/conf.d/auth.conf	50	ext/config/conf.d/auth.conf ext/config/services.d/ca.cfg \
		51	ext/system-config/services.d/bootstrap.cfg ext/bin/puppetserver
52	@${REINPLACE_CMD} -e "s\|%%PREFIX%%\|${PREFIX}\|" ${WRKSRC}/${file}	52	@${REINPLACE_CMD} -e "s\|%%PREFIX%%\|${PREFIX}\|" ${WRKSRC}/${file}
53	@${REINPLACE_CMD} -e "s\|%%RUBY_SITELIBDIR%%\|${RUBY_SITELIBDIR}\|" ${WRKSRC}/${file}	53	@${REINPLACE_CMD} -e "s\|%%RUBY_SITELIBDIR%%\|${RUBY_SITELIBDIR}\|" ${WRKSRC}/${file}
54	@${REINPLACE_CMD} -e "s\|%%RUBY_VER%%\|${RUBY_VER}\|" ${WRKSRC}/${file}	54	@${REINPLACE_CMD} -e "s\|%%RUBY_VER%%\|${RUBY_VER}\|" ${WRKSRC}/${file}
		55	@${REINPLACE_CMD} -e "s\|%%JAVA%%\|${JAVA}\|" ${WRKSRC}/${file}
		56	@${REINPLACE_CMD} -e "s\|%%ETCDIR%%\|${ETCDIR}\|" ${WRKSRC}/${file}
		57	@${REINPLACE_CMD} -e "s\|%%DATADIR%%\|${DATADIR}\|" ${WRKSRC}/${file}
55	.endfor	58	.endfor
56		59
57	do-install:	60	do-install:
Lines 60-76 Link Here
60	@${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps	63	@${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps
61	@${MKDIR} ${STAGEDIR}${ETCDIR}	64	@${MKDIR} ${STAGEDIR}${ETCDIR}
62	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d	65	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
		66	@${MKDIR} ${STAGEDIR}${ETCDIR}/services.d
63	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code	67	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code
		68	@${MKDIR} ${STAGEDIR}${PREFIX}/bin
64	@${MKDIR} ${STAGEDIR}/var/log/puppetserver	69	@${MKDIR} ${STAGEDIR}/var/log/puppetserver
65	${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppetserver.jar	70	@${MKDIR} ${STAGEDIR}/var/puppet/server
		71	${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar
66	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample	72	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample
67	${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample	73	${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample
68	${INSTALL_DATA} ${WRKSRC}/ext/config/bootstrap.cfg ${STAGEDIR}${ETCDIR}/bootstrap.cfg.sample
69	${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml.sample	74	${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml.sample
70	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf.sample	75	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf.sample
71	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf.sample	76	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf.sample
72	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf.sample	77	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf.sample
73	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf.sample	78	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf.sample
		79	${INSTALL_DATA} ${WRKSRC}/ext/config/services.d/ca.cfg ${STAGEDIR}${ETCDIR}/services.d/ca.cfg.sample
		80	${INSTALL_DATA} ${WRKSRC}/ext/system-config/services.d/bootstrap.cfg ${STAGEDIR}${ETCDIR}/services.d/bootstrap.cfg.sample
		81	${INSTALL_DATA} ${WRKSRC}/ext/bin/puppetserver ${STAGEDIR}${PREFIX}/bin/puppetserver
74	${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground	82	${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground
75	${INSTALL_DATA} ${WRKSRC}/ext/cli/gem ${STAGEDIR}${DATADIR}/cli/apps/gem	83	${INSTALL_DATA} ${WRKSRC}/ext/cli/gem ${STAGEDIR}${DATADIR}/cli/apps/gem
76	${INSTALL_DATA} ${WRKSRC}/ext/cli/irb ${STAGEDIR}${DATADIR}/cli/apps/irb	84	${INSTALL_DATA} ${WRKSRC}/ext/cli/irb ${STAGEDIR}${DATADIR}/cli/apps/irb

Line 0 Link Here

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

Lines 1-23 Link Here

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

Lines 1-10 Link Here

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