Date: Sat, 26 Oct 2013 02:22:07 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331647 - in head/sysutils/puppet: . files Message-ID: <201310260222.r9Q2M7m8053580@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sat Oct 26 02:22:07 2013 New Revision: 331647 URL: http://svnweb.freebsd.org/changeset/ports/331647 Log: - Refer to generic ruby binary in rc scripts - Fix missing %D in plist Modified: head/sysutils/puppet/Makefile head/sysutils/puppet/files/puppet.in head/sysutils/puppet/files/puppetmaster.in (contents, props changed) head/sysutils/puppet/pkg-plist Modified: head/sysutils/puppet/Makefile ============================================================================== --- head/sysutils/puppet/Makefile Sat Oct 26 02:04:40 2013 (r331646) +++ head/sysutils/puppet/Makefile Sat Oct 26 02:22:07 2013 (r331647) @@ -3,6 +3,7 @@ PORTNAME= puppet PORTVERSION= 3.3.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ Modified: head/sysutils/puppet/files/puppet.in ============================================================================== --- head/sysutils/puppet/files/puppet.in Sat Oct 26 02:04:40 2013 (r331646) +++ head/sysutils/puppet/files/puppet.in Sat Oct 26 02:22:07 2013 (r331647) @@ -24,7 +24,7 @@ load_rc_config "$name" command="%%PREFIX%%/bin/puppet" command_args="agent ${puppet_flags} --rundir=${puppet_rundir}" -command_interpreter=%%RUBY%% +command_interpreter=%%PREFIX%%/bin/ruby unset puppet_flags pidfile="${puppet_rundir}/agent.pid" Modified: head/sysutils/puppet/files/puppetmaster.in ============================================================================== --- head/sysutils/puppet/files/puppetmaster.in Sat Oct 26 02:04:40 2013 (r331646) +++ head/sysutils/puppet/files/puppetmaster.in Sat Oct 26 02:22:07 2013 (r331647) @@ -22,7 +22,7 @@ load_rc_config "${name}" : ${puppetmaster_rundir="/var/run/puppet"} : ${puppetmaster_flags="--rundir=${puppetmaster_rundir}"} -command_interpreter="%%PREFIX%%/bin/ruby18" +command_interpreter=%%PREFIX%%/bin/ruby command="%%PREFIX%%/bin/puppet" command_args="master ${puppetmaster_flags}" unset puppetmaster_flags Modified: head/sysutils/puppet/pkg-plist ============================================================================== --- head/sysutils/puppet/pkg-plist Sat Oct 26 02:04:40 2013 (r331646) +++ head/sysutils/puppet/pkg-plist Sat Oct 26 02:22:07 2013 (r331647) @@ -14,7 +14,7 @@ bin/puppet @dirrmtry etc/puppet @unexec rmdir /var/puppet 2>/dev/null || true @exec /bin/mkdir -p /var/puppet -@exec /bin/mkdir -p etc/puppet/modules +@exec /bin/mkdir -p %D/etc/puppet/modules @exec /usr/sbin/chown -Rh puppet:puppet /var/puppet @dirrm %%RUBY_SITELIBDIR%%/hiera/backend @dirrm %%RUBY_SITELIBDIR%%/hiera
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310260222.r9Q2M7m8053580>