Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Index: Makefile
===================================================================
--- Makefile (revision 410938)
+++ Makefile (working copy)
@@ -1,11 +1,11 @@
# $FreeBSD$
PORTNAME= puppetserver
-PORTVERSION= 2.2.1
+PORTVERSION= 2.3.1
CATEGORIES= sysutils java
MASTER_SITES= http://downloads.puppetlabs.com/puppet/
-MAINTAINER= xaque208@gmail.com
+MAINTAINER= zach@zleslie.info
COMMENT= Puppet Server running in the JVM
LICENSE= APACHE20
@@ -59,18 +59,24 @@
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
- ${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml
- ${INSTALL_DATA} ${WRKSRC}/ext/config/bootstrap.cfg ${STAGEDIR}${ETCDIR}/bootstrap.cfg
- ${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml
- ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/puppetserver.conf ${STAGEDIR}${ETCDIR}/conf.d/puppetserver.conf
- ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/web-routes.conf ${STAGEDIR}${ETCDIR}/conf.d/web-routes.conf
- ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/webserver.conf ${STAGEDIR}${ETCDIR}/conf.d/webserver.conf
- ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf
+ ${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/auth.conf ${STAGEDIR}${ETCDIR}/conf.d/auth.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.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/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.post.mk>
Index: distinfo
===================================================================
--- distinfo (revision 410938)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (puppetserver-2.2.1.tar.gz) = 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843
-SIZE (puppetserver-2.2.1.tar.gz) = 42665674
+SHA256 (puppetserver-2.3.1.tar.gz) = 25e0d27339c2e8313cb083503e5790e4f7f1c5c3b29a67b73a35a3aca2f513d9
+SIZE (puppetserver-2.3.1.tar.gz) = 33667638
Index: files/patch-ext__config__conf.d__webserver.conf
===================================================================
--- files/patch-ext__config__conf.d__webserver.conf (revision 410938)
+++ files/patch-ext__config__conf.d__webserver.conf (working copy)
@@ -1,9 +1,9 @@
---- ext/config/conf.d/webserver.conf.orig 2015-10-27 16:26:17 UTC
+--- ext/config/conf.d/webserver.conf.orig 2016-03-28 10:32:26.000000000 -0700
+++ ext/config/conf.d/webserver.conf
@@ -1,5 +1,5 @@
webserver: {
-- access-log-config = /etc/puppetlabs/puppetserver/request-logging.xml
-+ access-log-config = %%PREFIX%%/etc/puppetserver/request-logging.xml
- client-auth = want
- ssl-host = 0.0.0.0
- ssl-port = 8140
+- access-log-config: /etc/puppetlabs/puppetserver/request-logging.xml
++ access-log-config: %%PREFIX%%/etc/puppetserver/request-logging.xml
+ client-auth: want
+ ssl-host: 0.0.0.0
+ ssl-port: 8140
Index: pkg-plist
===================================================================
--- pkg-plist (revision 410938)
+++ pkg-plist (working copy)
@@ -1,14 +1,18 @@
-%%ETCDIR%%/logback.xml
-%%ETCDIR%%/bootstrap.cfg
-%%ETCDIR%%/request-logging.xml
-%%ETCDIR%%/conf.d/global.conf
-%%ETCDIR%%/conf.d/puppetserver.conf
-%%ETCDIR%%/conf.d/web-routes.conf
-%%ETCDIR%%/conf.d/webserver.conf
-%%ETCDIR%%/conf.d/auth.conf
+@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
%%DATADIR%%/puppetserver.jar
@mode 0750
@group puppet
@dir etc/puppet/code
@owner puppet
@dir /var/log/puppetserver
+%%DATADIR%%/cli/apps/foreground
+%%DATADIR%%/cli/apps/gem
+%%DATADIR%%/cli/apps/irb
+%%DATADIR%%/cli/apps/ruby
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment