Index: head/sysutils/puppetserver/Makefile =================================================================== --- head/sysutils/puppetserver/Makefile (revision 459724) +++ head/sysutils/puppetserver/Makefile (revision 459725) @@ -1,83 +1,83 @@ # $FreeBSD$ PORTNAME= puppetserver -PORTVERSION= 2.7.2 -PORTREVISION= 1 +PORTVERSION= 2.8.0 +PORTREVISION= 0 CATEGORIES= sysutils java MASTER_SITES= http://downloads.puppetlabs.com/puppet/ MAINTAINER= freebsd@zleslie.info COMMENT= Puppet Server running in the JVM LICENSE= APACHE20 RUN_DEPENDS= bash>=0:shells/bash \ puppet4>=0:sysutils/puppet4 BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake USE_RC_SUBR= puppetserver USE_JAVA= yes USE_RUBY= yes NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 1.7+ USERS= puppet GROUPS= puppet SUB_LIST= JAVA_HOME=${JAVA_HOME} SUB_FILES= pkg-message OPTIONS_DEFAULT= RFACTER OPTIONS_RADIO= FACTER OPTIONS_RADIO_FACTER= CFACTER RFACTER RFACTER_DESC= Use facter 2.x (written in Ruby) CFACTER_DESC= Use facter 3.x (experimental rewrite in C++) RFACTER_BUILD_DEPENDS= rubygem-facter>=2.0:sysutils/rubygem-facter RFACTER_RUN_DEPENDS= rubygem-facter>=2.0:sysutils/rubygem-facter CFACTER_BUILD_DEPENDS= facter>=3.0:sysutils/facter CFACTER_RUN_DEPENDS= facter>=3.0:sysutils/facter post-patch: .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/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}/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/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 ${INSTALL_DATA} ${WRKSRC}/ext/cli/ruby ${STAGEDIR}${DATADIR}/cli/apps/ruby .include Index: head/sysutils/puppetserver/distinfo =================================================================== --- head/sysutils/puppetserver/distinfo (revision 459724) +++ head/sysutils/puppetserver/distinfo (revision 459725) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485891106 -SHA256 (puppetserver-2.7.2.tar.gz) = 49341bbc0d6ec95b1790f92f1ca32f199f5ce1de442f35fd28f7d9cb04ce9fc3 -SIZE (puppetserver-2.7.2.tar.gz) = 33990767 +TIMESTAMP = 1504668940 +SHA256 (puppetserver-2.8.0.tar.gz) = 0f6f49b149639b80c3caecaeced44c7c0cb98728da7ce12f6725b061f3152812 +SIZE (puppetserver-2.8.0.tar.gz) = 34015599 Index: head/sysutils/puppetserver/files/patch-ext__config__conf.d__puppetserver.conf =================================================================== --- head/sysutils/puppetserver/files/patch-ext__config__conf.d__puppetserver.conf (revision 459724) +++ head/sysutils/puppetserver/files/patch-ext__config__conf.d__puppetserver.conf (revision 459725) @@ -1,53 +1,53 @@ --- 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: [ + %%RUBY_SITELIBDIR%%, -+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.4.6/lib, ++ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter/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 - master-conf-dir: /etc/puppetlabs/puppet + master-conf-dir: %%PREFIX%%/etc/puppet # (optional) path to puppet code dir; if not specified, will use # /etc/puppetlabs/code - master-code-dir: /etc/puppetlabs/code + master-code-dir: %%PREFIX%%/etc/puppet/code # (optional) path to puppet var dir; if not specified, will use # /opt/puppetlabs/server/data/puppetserver - master-var-dir: /opt/puppetlabs/server/data/puppetserver + master-var-dir: /var/puppet/server/data/puppetserver # (optional) path to puppet run dir; if not specified, will use # /var/run/puppetlabs/puppetserver - master-run-dir: /var/run/puppetlabs/puppetserver + master-run-dir: /var/run/puppetserver # (optional) path to puppet log dir; if not specified, will use # /var/log/puppetlabs/puppetserver - master-log-dir: /var/log/puppetlabs/puppetserver + master-log-dir: /var/log/puppetserver # (optional) maximum number of JRuby instances to allow #max-active-instances: 1