Attachment #170187 for bug #208363




# $FreeBSD$

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


.endfor

do-install:
	@${MKDIR} ${STAGEDIR}${DATADIR}
	@${MKDIR} ${STAGEDIR}${DATADIR}/cli
	@${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps
	@${MKDIR} ${STAGEDIR}${ETCDIR}
	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code
	@${MKDIR} ${STAGEDIR}/var/log/puppetserver
	${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppetserver.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/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
	${INSTALL_DATA} ${WRKSRC}/ext/cli/ruby ${STAGEDIR}${DATADIR}/cli/apps/ruby

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (puppetserver-2.2.1.tar.gz) = 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843	1	SHA256 (puppetserver-2.3.1.tar.gz) = 25e0d27339c2e8313cb083503e5790e4f7f1c5c3b29a67b73a35a3aca2f513d9
2	SIZE (puppetserver-2.2.1.tar.gz) = 42665674	2	SIZE (puppetserver-2.3.1.tar.gz) = 33667638

Lines 1-9 Link Here

(-)files/patch-ext__config__conf.d__webserver.conf (-6 / +6 lines)
1	--- ext/config/conf.d/webserver.conf.orig 2015-10-27 16:26:17 UTC	1	--- ext/config/conf.d/webserver.conf.orig 2016-03-28 10:32:26.000000000 -0700
2	+++ ext/config/conf.d/webserver.conf	2	+++ ext/config/conf.d/webserver.conf
3	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
4	webserver: {	4	webserver: {
5	- access-log-config = /etc/puppetlabs/puppetserver/request-logging.xml	5	- access-log-config: /etc/puppetlabs/puppetserver/request-logging.xml
6	+ access-log-config = %%PREFIX%%/etc/puppetserver/request-logging.xml	6	+ access-log-config: %%PREFIX%%/etc/puppetserver/request-logging.xml
7	client-auth = want	7	client-auth: want
8	ssl-host = 0.0.0.0	8	ssl-host: 0.0.0.0
9	ssl-port = 8140	9	ssl-port: 8140




@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
@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
@dir(puppet,puppet,750) /var/log/puppetserver

Return to bug 208363

Lines 1-7 Link Here

(-)Makefile (-14 / +20 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= puppetserver	3	PORTNAME= puppetserver
4	PORTVERSION= 2.2.1	4	PORTVERSION= 2.3.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
Lines 55-73 Link Here
55	.endfor	55	.endfor
56		56
57	do-install:	57	do-install:
58	${MKDIR} ${STAGEDIR}${DATADIR}	58	@${MKDIR} ${STAGEDIR}${DATADIR}
59	${MKDIR} ${STAGEDIR}${ETCDIR}	59	@${MKDIR} ${STAGEDIR}${DATADIR}/cli
60	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d	60	@${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps
61	${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code	61	@${MKDIR} ${STAGEDIR}${ETCDIR}
62	${MKDIR} ${STAGEDIR}/var/log/puppetserver	62	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
		63	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code
		64	@${MKDIR} ${STAGEDIR}/var/log/puppetserver
63	${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppetserver.jar	65	${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppetserver.jar
64	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf	66	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample
65	${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml	67	${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample
66	${INSTALL_DATA} ${WRKSRC}/ext/config/bootstrap.cfg ${STAGEDIR}${ETCDIR}/bootstrap.cfg	68	${INSTALL_DATA} ${WRKSRC}/ext/config/bootstrap.cfg ${STAGEDIR}${ETCDIR}/bootstrap.cfg.sample
67	${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml	69	${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml.sample
68	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf	70	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf.sample
69	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf	71	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf.sample
70	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf	72	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf.sample
71	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf	73	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf.sample
		74	${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground
		75	${INSTALL_DATA} ${WRKSRC}/ext/cli/gem ${STAGEDIR}${DATADIR}/cli/apps/gem
		76	${INSTALL_DATA} ${WRKSRC}/ext/cli/irb ${STAGEDIR}${DATADIR}/cli/apps/irb
		77	${INSTALL_DATA} ${WRKSRC}/ext/cli/ruby ${STAGEDIR}${DATADIR}/cli/apps/ruby
72		78
73	.include <bsd.port.mk>	79	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)pkg-plist (-13 / +14 lines)
1	%%ETCDIR%%/logback.xml	1	@sample %%ETCDIR%%/logback.xml.sample
2	%%ETCDIR%%/bootstrap.cfg	2	@sample %%ETCDIR%%/bootstrap.cfg.sample
3	%%ETCDIR%%/request-logging.xml	3	@sample %%ETCDIR%%/request-logging.xml.sample
4	%%ETCDIR%%/conf.d/global.conf	4	@sample %%ETCDIR%%/conf.d/auth.conf.sample
5	%%ETCDIR%%/conf.d/puppetserver.conf	5	@sample %%ETCDIR%%/conf.d/global.conf.sample
6	%%ETCDIR%%/conf.d/web-routes.conf	6	@sample %%ETCDIR%%/conf.d/puppetserver.conf.sample
7	%%ETCDIR%%/conf.d/webserver.conf	7	@sample %%ETCDIR%%/conf.d/web-routes.conf.sample
8	%%ETCDIR%%/conf.d/auth.conf	8	@sample %%ETCDIR%%/conf.d/webserver.conf.sample
		9	@dir(,puppet,750) etc/puppet/code
9	%%DATADIR%%/puppetserver.jar	10	%%DATADIR%%/puppetserver.jar
10	@mode 0750	11	%%DATADIR%%/cli/apps/foreground
11	@group puppet	12	%%DATADIR%%/cli/apps/gem
12	@dir etc/puppet/code	13	%%DATADIR%%/cli/apps/irb
13	@owner puppet	14	%%DATADIR%%/cli/apps/ruby
14	@dir /var/log/puppetserver	15	@dir(puppet,puppet,750) /var/log/puppetserver