Index: head/sysutils/puppetserver/Makefile =================================================================== --- head/sysutils/puppetserver/Makefile (revision 428144) +++ head/sysutils/puppetserver/Makefile (revision 428145) @@ -1,79 +1,87 @@ # $FreeBSD$ PORTNAME= puppetserver -PORTVERSION= 2.4.0 +PORTVERSION= 2.7.1 CATEGORIES= sysutils java MASTER_SITES= http://downloads.puppetlabs.com/puppet/ -MAINTAINER= xaque208@gmail.com +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 PKGMESSAGE= ${WRKDIR}/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/bootstrap.cfg ext/config/logback.xml \ - ext/config/request-logging.xml \ +.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/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} @${MKDIR} ${STAGEDIR}${DATADIR}/cli @${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 - ${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppetserver.jar + @${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 ${INSTALL_DATA} ${WRKSRC}/ext/cli/ruby ${STAGEDIR}${DATADIR}/cli/apps/ruby .include Index: head/sysutils/puppetserver/distinfo =================================================================== --- head/sysutils/puppetserver/distinfo (revision 428144) +++ head/sysutils/puppetserver/distinfo (revision 428145) @@ -1,3 +1,3 @@ TIMESTAMP = 1465154007 -SHA256 (puppetserver-2.4.0.tar.gz) = 81d574f7483760bd70cafc079486fe14d243137612f0c130069d94ba7d4fded4 -SIZE (puppetserver-2.4.0.tar.gz) = 33822659 +SHA256 (puppetserver-2.7.1.tar.gz) = 9e2ad86fedb719e824d42055383dbbbb4f66c621e21c4c285e70b5c1dbc158c0 +SIZE (puppetserver-2.7.1.tar.gz) = 33989388 Index: head/sysutils/puppetserver/files/patch-ext__bin__puppetserver =================================================================== --- head/sysutils/puppetserver/files/patch-ext__bin__puppetserver (nonexistent) +++ head/sysutils/puppetserver/files/patch-ext__bin__puppetserver (revision 428145) @@ -0,0 +1,21 @@ +--- 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 Property changes on: head/sysutils/puppetserver/files/patch-ext__bin__puppetserver ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/puppetserver/files/patch-ext__config__conf.d__puppetserver.conf =================================================================== --- head/sysutils/puppetserver/files/patch-ext__config__conf.d__puppetserver.conf (revision 428144) +++ head/sysutils/puppetserver/files/patch-ext__config__conf.d__puppetserver.conf (revision 428145) @@ -1,48 +1,53 @@ ---- ext/config/conf.d/puppetserver.conf.orig 2015-10-27 17:03:52 UTC -+++ ext/config/conf.d/puppetserver.conf -@@ -2,11 +2,14 @@ - jruby-puppet: { +--- 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: [/opt/puppetlabs/puppet/lib/ruby/vendor_ruby] + ruby-load-path: [ + %%RUBY_SITELIBDIR%%, -+ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.4.4/lib/, ++ %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.4.6/lib, + ] - # This setting determines where JRuby will look for gems. It is also - # used by the `puppetserver gem` command line tool. + # 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 -@@ -22,23 +25,23 @@ + # 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 Index: head/sysutils/puppetserver/files/patch-ext__config__request-logging.xml =================================================================== --- head/sysutils/puppetserver/files/patch-ext__config__request-logging.xml (revision 428144) +++ head/sysutils/puppetserver/files/patch-ext__config__request-logging.xml (revision 428145) @@ -1,10 +1,15 @@ ---- ext/config/request-logging.xml.orig 2015-10-27 16:40:09 UTC -+++ ext/config/request-logging.xml -@@ -1,6 +1,6 @@ +--- 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 @@ - -- /var/log/puppetlabs/puppetserver/puppetserver-access.log -+ /var/log/puppetserver/puppetserver-access.log - - %h %l %u %user %date "%r" %s %b %h %a %localPort %D - + +- /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 Index: head/sysutils/puppetserver/files/pkg-message.in =================================================================== --- head/sysutils/puppetserver/files/pkg-message.in (revision 428144) +++ head/sysutils/puppetserver/files/pkg-message.in (revision 428145) @@ -1 +1,10 @@ Remember to add puppetserver_enable="YES" to rc.conf. + +A note to users upgrading to 2.6 who have also modified bootstrap.cfg, please +see the release notes for breaking changes in 2.5. + +https://docs.puppet.com/puppetserver/latest/release_notes.html#puppet-server-25 + +The file bootstrap.cfg has been removed and ca configuration has been moved out +to its own file in ca.cfg. + Property changes on: head/sysutils/puppetserver/files/pkg-message.in ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -ON \ No newline at end of property +yes \ No newline at end of property Index: head/sysutils/puppetserver/files/puppetserver.in =================================================================== --- head/sysutils/puppetserver/files/puppetserver.in (revision 428144) +++ head/sysutils/puppetserver/files/puppetserver.in (revision 428145) @@ -1,82 +1,82 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: puppetserver # REQUIRE: LOGIN # KEYWORD: shutdown # # Configuration settings for puppetserver in /etc/rc.conf: # # puppetserver_enable (bool): # Set to "NO" by default. # Set it to "YES" to enable puppetserver # # puppetserver_args (str): # Extra arguments passed to start command # # puppetserver_java_home (str): # Set to "%%JAVA_HOME%%" by default. # Set the Java virtual machine to run puppetserver # # puppetserver_java_opts (str): # Set to "" by default. # Java VM args to use. # # puppetserver_user (str): # Set to "puppet" by default. # User to run puppetserver as. # # puppetserver_group (str): # Set to "puppet" by default. # Group for data file ownership. # # puppetserver_log_file (str): # Set to "/var/log/puppetserver/puppetserver.log" by default. # Log file location. # . /etc/rc.subr name="puppetserver" rcvar=puppetserver_enable load_rc_config "${name}" : ${puppetserver_enable="NO"} -: ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/bootstrap.cfg"} +: ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/services.d"} : ${puppetserver_java_home="%%JAVA_HOME%%"} : ${puppetserver_user="puppet"} : ${puppetserver_group="puppet"} : ${puppetserver_log_file="/var/log/puppetserver/puppetserver.log"} pidfile="/var/run/puppetserver/puppetserver.pid" command="/usr/sbin/daemon" java_cmd="${puppetserver_java_home}/bin/java" procname="${java_cmd}" -command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppetserver.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args} > ${puppetserver_log_file} 2>&1" +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" required_files="${java_cmd}" start_precmd="puppetserver_prestart" puppetserver_prestart() { if [ ! -f "${puppetserver_log_file}" ]; then touch "${puppetserver_log_file}" chown "${puppetserver_user}:${puppetserver_group}" "${puppetserver_log_file}" chmod 640 "${puppetserver_log_file}" fi if [ ! -d "/var/run/puppetserver" ]; then install -d -o "${puppetserver_user}" -g "${puppetserver_group}" -m 750 "/var/run/puppetserver" fi chown -R "root:${puppetserver_group}" "%%PREFIX%%/etc/puppetserver/conf.d" chmod 0750 "%%PREFIX%%/etc/puppetserver/conf.d" chown "root:${puppetserver_group}" "%%PREFIX%%/etc/puppetserver/logback.xml" chmod 0640 "%%PREFIX%%/etc/puppetserver/logback.xml" } run_rc_command "$1" Index: head/sysutils/puppetserver/pkg-plist =================================================================== --- head/sysutils/puppetserver/pkg-plist (revision 428144) +++ head/sysutils/puppetserver/pkg-plist (revision 428145) @@ -1,15 +1,19 @@ +@(,,750) bin/puppetserver @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 +@sample %%ETCDIR%%/services.d/bootstrap.cfg.sample +@sample %%ETCDIR%%/services.d/ca.cfg.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 +%%DATADIR%%/puppet-server-release.jar +@(,,755) %%DATADIR%%/cli/apps/foreground +@(,,755) %%DATADIR%%/cli/apps/gem +@(,,755) %%DATADIR%%/cli/apps/irb +@(,,755) %%DATADIR%%/cli/apps/ruby @dir(puppet,puppet,750) /var/log/puppetserver +@dir(puppet,puppet,755) /var/puppet +@dir(puppet,puppet,750) /var/puppet/server