Index: head/sysutils/puppet/Makefile =================================================================== --- head/sysutils/puppet/Makefile (revision 391662) +++ head/sysutils/puppet/Makefile (revision 391663) @@ -1,110 +1,111 @@ # Created by: Tomoyuki Sakurai # $FreeBSD$ PORTNAME= puppet PORTVERSION= 3.8.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ MAINTAINER= swills@FreeBSD.org COMMENT= Configuration management framework written in Ruby LICENSE= APACHE20 BUILD_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera RUN_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-ruby-augeas \ rubygem-hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera USES= cpe CPE_VENDOR= puppetlabs CONFLICTS_INSTALL= puppet37-* NO_BUILD= yes USE_RUBY= yes USE_RUBY_FEATURES= iconv USE_RC_SUBR= puppet puppetmaster PORTDOCS= LICENSE README.md PORTEXAMPLES= * USERS= puppet GROUPS= puppet SUB_FILES+= pkg-message SUB_LIST= RUBY=${RUBY} OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_DEFAULT= PACKAGE_ORIGIN OPTIONS_RADIO= PATCHES OPTIONS_RADIO_PATCHES= PACKAGE_ORIGIN PACKAGE_ROOT PACKAGE_ORIGIN_DESC= Use port origin as package name PACKAGE_ROOT_DESC= Use PACKAGEROOT instead of PACKAGESITE PATCHES_DESC= Optional exclusive patches .include .if ${PORT_OPTIONS:MPACKAGE_ROOT} .if ! ${PORT_OPTIONS:MPACKAGE_ORIGIN} EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_root .else BROKEN= PACKAGE_ROOT option patch is incompatible with PACKAGE_ORIGIN patch. .endif .endif .include # puppet 4.x should support ruby 2.2.x .if ${RUBY_VER} >= 2.2 BROKEN= Does not work with Ruby 2.2 .endif .if ${PORT_OPTIONS:MPACKAGE_ORIGIN} EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_origin RUN_DEPENDS+= rubygem-bzip2-ruby>=0:${PORTSDIR}/archivers/rubygem-bzip2-ruby .endif post-patch: @${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \ ${WRKSRC}/install.rb \ ${WRKSRC}/lib/puppet/reference/configuration.rb \ ${WRKSRC}/lib/puppet/defaults.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|/var/lib/puppet|/var/puppet|" \ ${WRKSRC}/lib/puppet/reference/configuration.rb \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|\$$vardir/run|/var/run/puppet|" \ ${WRKSRC}/lib/puppet/util/run_mode.rb @${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \ ${WRKSRC}/lib/puppet/defaults.rb @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \ ${WRKSRC}/ext/rack/config.ru do-install: @cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} post-install: ${MKDIR} ${STAGEDIR}${ETCDIR}/manifests ${MKDIR} ${STAGEDIR}${ETCDIR}/modules ${MKDIR} ${STAGEDIR}/var/puppet ${INSTALL_DATA} ${WRKSRC}/conf/auth.conf ${STAGEDIR}${ETCDIR}/auth.conf-dist ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \ --confdir=${ETCDIR} \ --rundir=/var/run/puppet \ --vardir=/var/puppet \ --logdir=/var/log/puppet \ > ${STAGEDIR}${ETCDIR}/puppet.conf-dist @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} @${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/semver.rb | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${MKDIR} ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/ext/rack/example-passenger-vhost.conf ${STAGEDIR}${EXAMPLESDIR} .include Index: head/sysutils/puppet/files/puppet.in =================================================================== --- head/sysutils/puppet/files/puppet.in (revision 391662) +++ head/sysutils/puppet/files/puppet.in (revision 391663) @@ -1,33 +1,33 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: puppet -# REQUIRE: NETWORK +# REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable the puppet agent: # # puppet_enable="YES" . /etc/rc.subr name="puppet" rcvar=puppet_enable load_rc_config "$name" : ${puppet_enable="NO"} : ${puppet_rundir="/var/run/puppet"} command="%%PREFIX%%/bin/puppet" command_args="agent ${puppet_flags} --rundir=${puppet_rundir}" command_interpreter=%%RUBY%% unset puppet_flags pidfile="${puppet_rundir}/agent.pid" start_precmd="install -d -o puppet -g puppet ${pidfile%/*}" run_rc_command "$1" Index: head/sysutils/puppet/files/puppetmaster.in =================================================================== --- head/sysutils/puppet/files/puppetmaster.in (revision 391662) +++ head/sysutils/puppet/files/puppetmaster.in (revision 391663) @@ -1,56 +1,56 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: puppetmaster -# REQUIRE: NETWORK +# REQUIRE: LOGIN # Add the following lines to /etc/rc.conf to enable the puppetmaster: # # puppetmaster_enable="YES" # . /etc/rc.subr name="puppetmaster" rcvar=puppetmaster_enable load_rc_config "${name}" : ${puppetmaster_enable="NO"} : ${puppetmaster_rundir="/var/run/puppet"} : ${puppetmaster_flags="--rundir=${puppetmaster_rundir}"} command_interpreter=%%RUBY%% command="%%PREFIX%%/bin/puppet" command_args="master ${puppetmaster_flags}" unset puppetmaster_flags pidfile="${puppetmaster_rundir}/master.pid" puppet_manifestdir="$($command config print manifestdir)" start_precmd="puppetmaster_checkconfig" restart_precmd="puppetmaster_checkconfig" puppetmaster_checkconfig() { echo -n "Performing sanity check of ${name} configuration: " if ! ${command} parser validate "${puppet_manifestdir}/site.pp" then echo "FAILED" return 1 else echo "OK" return 0 fi } if [ -z "${puppetmaster_mongrel_ports}" ]; then run_rc_command "$1" else for port in ${puppetmaster_mongrel_ports}; do pidfile="${puppetmaster_rundir}/mongrel.${port}.pid" command_args="master --pidfile=${pidfile} --servertype=mongrel --masterport=${port}" run_rc_command "$1" _rc_restart_done="false" done fi