Index: head/sysutils/puppetserver/Makefile =================================================================== --- head/sysutils/puppetserver/Makefile (revision 474936) +++ head/sysutils/puppetserver/Makefile (revision 474937) @@ -1,83 +1,83 @@ # $FreeBSD$ PORTNAME= puppetserver PORTVERSION= 2.8.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= sysutils java -MASTER_SITES= http://downloads.puppetlabs.com/puppet/ +MASTER_SITES= https://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/files/puppetserver.in =================================================================== --- head/sysutils/puppetserver/files/puppetserver.in (revision 474936) +++ head/sysutils/puppetserver/files/puppetserver.in (revision 474937) @@ -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/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%%/puppet-server-release.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}" 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"