Index: head/sysutils/puppetserver5/Makefile =================================================================== --- head/sysutils/puppetserver5/Makefile (revision 483015) +++ head/sysutils/puppetserver5/Makefile (revision 483016) @@ -1,96 +1,93 @@ # $FreeBSD$ PORTNAME= puppetserver -PORTVERSION= 5.3.5 +PORTVERSION= 5.3.6 CATEGORIES= sysutils java MASTER_SITES= https://downloads.puppetlabs.com/puppet/ PKGNAMESUFFIX= 5 MAINTAINER= puppet@FreeBSD.org COMMENT= Puppet Server running in the JVM LICENSE= APACHE20 RUN_DEPENDS= bash>=0:shells/bash \ puppet5>=0:sysutils/puppet5 -BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake USES= shebangfix USE_RC_SUBR= puppetserver USE_JAVA= yes USE_RUBY= yes NO_ARCH= yes NO_BUILD= yes JAVA_VERSION= 1.8+ CONFLICTS_INSTALL= puppetserver-* puppetserver6-* SHEBANG_FILES= ext/bin/puppetserver USERS= puppet GROUPS= puppet SUB_LIST= JAVA_HOME=${JAVA_HOME} SUB_FILES= pkg-message OPTIONS_DEFAULT= CFACTER 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 \ ext/cli_defaults/cli-defaults.sh @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ -e 's|%%RUBY_SITELIBDIR%%|${RUBY_SITELIBDIR}|' \ -e 's|%%RUBY_VER%%|${RUBY_VER}|' \ -e 's|%%JAVA%%|${JAVA}|' \ -e 's|%%ETCDIR%%|${ETCDIR}|' \ -e 's|%%DATADIR%%|${DATADIR}|' \ ${WRKSRC}/${file} .endfor do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps @${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}/jruby-9k.jar ${STAGEDIR}${DATADIR}/jruby-9k.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/conf.d/metrics.conf ${STAGEDIR}${ETCDIR}/conf.d/metrics.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/ezbake-functions.sh ${STAGEDIR}${DATADIR}/ezbake-functions.sh ${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/reload ${STAGEDIR}${DATADIR}/cli/apps/reload ${INSTALL_DATA} ${WRKSRC}/ext/cli/ruby ${STAGEDIR}${DATADIR}/cli/apps/ruby ${INSTALL_DATA} ${WRKSRC}/ext/cli/start ${STAGEDIR}${DATADIR}/cli/apps/start ${INSTALL_DATA} ${WRKSRC}/ext/cli/stop ${STAGEDIR}${DATADIR}/cli/apps/stop ${INSTALL_DATA} ${WRKSRC}/ext/cli_defaults/cli-defaults.sh ${STAGEDIR}${DATADIR}/cli/cli-defaults.sh .include Index: head/sysutils/puppetserver5/distinfo =================================================================== --- head/sysutils/puppetserver5/distinfo (revision 483015) +++ head/sysutils/puppetserver5/distinfo (revision 483016) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535015241 -SHA256 (puppetserver-5.3.5.tar.gz) = 27a299450e849abec6a4efea64cc571f041fe57c3f5692765f58acd66f8ff625 -SIZE (puppetserver-5.3.5.tar.gz) = 67238513 +TIMESTAMP = 1540363367 +SHA256 (puppetserver-5.3.6.tar.gz) = 96e690412a721d9d9fe8550d7d0203c12648c5d75375babb8a8acfd635827873 +SIZE (puppetserver-5.3.6.tar.gz) = 67822906 Index: head/sysutils/puppetserver5/files/patch-ext__bin__puppetserver =================================================================== --- head/sysutils/puppetserver5/files/patch-ext__bin__puppetserver (revision 483015) +++ head/sysutils/puppetserver5/files/patch-ext__bin__puppetserver (revision 483016) @@ -1,15 +1,15 @@ ---- ext/bin/puppetserver.orig 2017-09-28 10:58:44.784311406 -0700 -+++ ext/bin/puppetserver 2017-09-28 11:00:46.034742764 -0700 -@@ -14,6 +14,12 @@ +--- ext/bin/puppetserver.orig 2018-09-28 11:06:23 UTC ++++ ext/bin/puppetserver +@@ -15,6 +15,12 @@ elif [ `uname` == "OpenBSD" ] ; then 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 Index: head/sysutils/puppetserver5/files/patch-ext__cli_defaults__cli-defaults.sh =================================================================== --- head/sysutils/puppetserver5/files/patch-ext__cli_defaults__cli-defaults.sh (revision 483015) +++ head/sysutils/puppetserver5/files/patch-ext__cli_defaults__cli-defaults.sh (revision 483016) @@ -1,11 +1,11 @@ ---- ext/cli_defaults/cli-defaults.sh.orig 2017-08-06 01:24:37.981353156 -0700 -+++ ext/cli_defaults/cli-defaults.sh 2017-08-06 01:39:53.280636611 -0700 +--- ext/cli_defaults/cli-defaults.sh.orig 2018-08-21 16:07:05 UTC ++++ ext/cli_defaults/cli-defaults.sh @@ -1,6 +1,6 @@ -INSTALL_DIR="/opt/puppetlabs/server/apps/puppetserver" +INSTALL_DIR="%%DATADIR%%" -JRUBY_JAR="${JRUBY_JAR:-${INSTALL_DIR}/jruby-1_7.jar}" +JRUBY_JAR="${JRUBY_JAR:-${INSTALL_DIR}/jruby-9k.jar}" if [ ! -e "$JRUBY_JAR" ]; then echo "Unable to find specified JRUBY_JAR: ${JRUBY_JAR}" 1>&2 Index: head/sysutils/puppetserver5/files/patch-ext__config__conf.d__global.conf =================================================================== --- head/sysutils/puppetserver5/files/patch-ext__config__conf.d__global.conf (revision 483015) +++ head/sysutils/puppetserver5/files/patch-ext__config__conf.d__global.conf (revision 483016) @@ -1,9 +1,9 @@ ---- ext/config/conf.d/global.conf.orig 2017-08-02 20:34:12.049821329 -0700 -+++ ext/config/conf.d/global.conf 2017-08-02 20:35:03.130347445 -0700 +--- ext/config/conf.d/global.conf.orig 2018-08-21 16:07:02 UTC ++++ ext/config/conf.d/global.conf @@ -1,5 +1,5 @@ global: { # Path to logback logging configuration file; for more # info, see http://logback.qos.ch/manual/configuration.html - logging-config: /etc/puppetlabs/puppetserver/logback.xml + logging-config: %%PREFIX%%/etc/puppetserver/logback.xml } Index: head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf =================================================================== --- head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf (revision 483015) +++ head/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf (revision 483016) @@ -1,55 +1,55 @@ ---- ext/config/conf.d/puppetserver.conf.orig 2017-08-02 20:01:48.229660631 -0700 -+++ ext/config/conf.d/puppetserver.conf 2017-08-04 14:00:29.705675760 -0700 +--- ext/config/conf.d/puppetserver.conf.orig 2018-08-21 16:07:02 UTC ++++ ext/config/conf.d/puppetserver.conf @@ -2,16 +2,20 @@ 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/vendor_ruby, + %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.5.0/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", "/opt/puppetlabs/puppet/lib/ruby/vendor_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 @@ +@@ -26,23 +30,23 @@ jruby-puppet: { # (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 Index: head/sysutils/puppetserver5/files/patch-ext__config__conf.d__webserver.conf =================================================================== --- head/sysutils/puppetserver5/files/patch-ext__config__conf.d__webserver.conf (revision 483015) +++ head/sysutils/puppetserver5/files/patch-ext__config__conf.d__webserver.conf (revision 483016) @@ -1,9 +1,9 @@ ---- ext/config/conf.d/webserver.conf.orig 2016-03-28 10:32:26.000000000 -0700 +--- ext/config/conf.d/webserver.conf.orig 2018-08-21 16:07:02 UTC +++ 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 Index: head/sysutils/puppetserver5/files/patch-ext__config__logback.xml =================================================================== --- head/sysutils/puppetserver5/files/patch-ext__config__logback.xml (revision 483015) +++ head/sysutils/puppetserver5/files/patch-ext__config__logback.xml (revision 483016) @@ -1,17 +1,17 @@ ---- ext/config/logback.xml.orig 2017-08-02 19:46:03.829675373 -0700 -+++ ext/config/logback.xml 2017-08-02 19:50:56.742766644 -0700 +--- ext/config/logback.xml.orig 2018-08-21 16:07:02 UTC ++++ ext/config/logback.xml @@ -6,12 +6,11 @@ - - /var/log/puppetlabs/puppetserver/puppetserver.log + /var/log/puppetserver/puppetserver.log true - /var/log/puppetlabs/puppetserver/puppetserver-%d{yyyy-MM-dd}.%i.log.gz + /var/log/puppetserver/puppetserver-%d{yyyy-MM-dd}.%i.log.gz 200MB 90 Index: head/sysutils/puppetserver5/files/patch-ext__config__request-logging.xml =================================================================== --- head/sysutils/puppetserver5/files/patch-ext__config__request-logging.xml (revision 483015) +++ head/sysutils/puppetserver5/files/patch-ext__config__request-logging.xml (revision 483016) @@ -1,15 +1,15 @@ ---- 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 +--- ext/config/request-logging.xml.orig 2018-08-21 16:07:02 UTC ++++ ext/config/request-logging.xml @@ -1,10 +1,10 @@ - /var/log/puppetlabs/puppetserver/puppetserver-access.log + /var/log/puppetserver/puppetserver-access.log true - /var/log/puppetlabs/puppetserver/puppetserver-access-%d{yyyy-MM-dd}.%i.log.gz + /var/log/puppetserver/puppetserver-access-%d{yyyy-MM-dd}.%i.log.zip 200MB 90