mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00
Code Issues Releases Activity

- Create and delete work directories for puppet. this fixes ports/126968

Browse Source 
- Fix typos in pkg-message

PR:		ports/127078
Submitted by:	Tomoyuki Sakurai <cherry@trombik.org> (maintainer)
This commit is contained in:
Beech Rintoul 2008-09-04 19:08:58 +00:00
parent 30e929a8f8
commit b1ef5294f4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=219856
5 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/puppet-devel/Makefile
View File

@ -28,10 +28,12 @@ DOCS= CHANGELOG README LICENSE COPYING
PUPPET_USER:= puppet
PUPPET_GROUP:= ${PUPPET_USER}
PUPPET_RUNDIR:= /var/run/${PORTNAME}
SUB_FILES+= pkg-install pkg-message
PUPPET_WORKDIR:= /var/${PORTNAME}
SUB_FILES+= pkg-install pkg-message pkg-deinstall
SUB_LIST+= PUPPET_RUNDIR="${PUPPET_RUNDIR}" \
PUPPET_USER="${PUPPET_USER}" \
PUPPET_GROUP="${PUPPET_GROUP}"
PUPPET_GROUP="${PUPPET_GROUP}" \
PUPPET_WORKDIR="${PUPPET_WORKDIR}"
.include <bsd.port.pre.mk>

13
sysutils/puppet-devel/files/pkg-deinstall.in Normal file
View File

@ -0,0 +1,13 @@
#!/bin/sh
# $FreeBSD: /tmp/pcvs/ports/sysutils/puppet-devel/files/Attic/pkg-deinstall.in,v 1.1 2008-09-04 19:08:58 beech Exp $
PATH="/bin:/sbin:/usr/bin:/usr/sbin"
RUNDIR=%%PUPPET_RUNDIR%%
WORKDIR=%%PUPPET_WORKDIR%%
if [ "$2" = "POST-DEINSTALL" ]; then
echo "=> Deleting ${RUNDIR} if empty..."
rm -d ${RUNDIR} 2>/dev/null || true
echo "=> Deleting ${WORKDIR} if empty..."
rm -d ${WORKDIR} 2>/dev/null || true
fi

14
sysutils/puppet-devel/files/pkg-install.in
View File

@ -8,6 +8,7 @@ UID=814
GID=$UID
RUNDIR=%%PUPPET_RUNDIR%%
WORKDIR=%%PUPPET_WORKDIR%%
PW="pw"
CHOWN="chown"
@ -36,7 +37,18 @@ if [ "$2" = "PRE-INSTALL" ]; then
fi
elif [ "$2" = "POST-INSTALL" ]; then
${INSTALL_DIR} ${RUNDIR}
if [ -d ${RUNDIR} ]; then
echo "=> ${RUNDIR} already exists."
else
echo -n "=> Creating RUNDIR ${RUNDIR}... "
${INSTALL_DIR} ${RUNDIR} || echo "failed"
fi
if [ -d ${WORKDIR} ]; then
echo "=> ${WORKDIR} already exists."
else
echo -n "=> Creating WORKDIR ${WORKDIR}... "
${INSTALL_DIR} ${WORKDIR} || echo "failed"
fi
fi
exit 0

5
sysutils/puppet-devel/files/pkg-message.in
View File

@ -1,3 +1,4 @@
To enable puppetd and/or puppetmasterd, add:
puppetd_enable="YES"
@ -5,7 +6,7 @@ puppetmasterd_enable="YES"
to /etc/rc.conf
Indivisual config files such as %%PREFIX%%/etc/puppetmasterd.conf are
deprecated. Use a single file, %%PREFIX%%/puppet/puppet.conf.
Individual config files such as %%PREFIX%%/etc/puppet/puppetmasterd.conf are
deprecated. Use a single file, %%PREFIX%%/etc/puppet/puppet.conf.
Now the default PID directory is %%PUPPET_RUNDIR%%.

1
sysutils/puppet-devel/pkg-plist
View File

@ -11,4 +11,3 @@ etc/puppet/puppet.conf-dist
@dirrmtry etc/puppet/ssl
@dirrmtry etc/puppet/manifests
@dirrmtry etc/puppet
@dirrmtry /var/run/puppet