diff options
| author | swills <swills@FreeBSD.org> | 2013-10-26 10:22:07 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2013-10-26 10:22:07 +0800 |
| commit | 5a949b523f30b27cfb4e256d68537452537bf5f0 (patch) | |
| tree | fcd574512c854496b64112cc2dcbadae1a5bb306 /sysutils | |
| parent | 34373a502d915388e91477d714bcdfb0b681fdc6 (diff) | |
| download | freebsd-ports-gnome-5a949b523f30b27cfb4e256d68537452537bf5f0.tar.gz freebsd-ports-gnome-5a949b523f30b27cfb4e256d68537452537bf5f0.tar.zst freebsd-ports-gnome-5a949b523f30b27cfb4e256d68537452537bf5f0.zip | |
- Refer to generic ruby binary in rc scripts
- Fix missing %D in plist
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/puppet/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/puppet/files/puppet.in | 2 | ||||
| -rw-r--r-- | sysutils/puppet/files/puppetmaster.in | 2 | ||||
| -rw-r--r-- | sysutils/puppet/pkg-plist | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index 0db0d7d29deb..c36fdbdc6623 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -3,6 +3,7 @@ PORTNAME= puppet PORTVERSION= 3.3.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ diff --git a/sysutils/puppet/files/puppet.in b/sysutils/puppet/files/puppet.in index c741d40c14f6..412e61f48354 100644 --- a/sysutils/puppet/files/puppet.in +++ b/sysutils/puppet/files/puppet.in @@ -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" diff --git a/sysutils/puppet/files/puppetmaster.in b/sysutils/puppet/files/puppetmaster.in index fe38db24fde6..26bcda5a805a 100644 --- a/sysutils/puppet/files/puppetmaster.in +++ b/sysutils/puppet/files/puppetmaster.in @@ -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 diff --git a/sysutils/puppet/pkg-plist b/sysutils/puppet/pkg-plist index 5e85672d14e1..0e1642216644 100644 --- a/sysutils/puppet/pkg-plist +++ b/sysutils/puppet/pkg-plist @@ -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 |