ports/110618: [MAINTAINER] sysutils/puppet: add rc.d scripts and default config file
Tomoyuki Sakurai
cherry at trombik.org
Wed Mar 21 16:20:05 UTC 2007
The following reply was made to PR ports/110618; it has been noted by GNATS.
From: Tomoyuki Sakurai <cherry at trombik.org>
To: bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/110618: [MAINTAINER] sysutils/puppet: add rc.d scripts
and default config file
Date: Thu, 22 Mar 2007 01:11:20 +0900
--OXfL5xGRrasGEqWY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
This one includes a patch which fixes ports/110543.
--
Tomoyuki Sakurai - Tomi -
--OXfL5xGRrasGEqWY
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="110543.patch"
diff -ruN /usr/ports/sysutils/puppet/Makefile /usr/home/cherry/svn/ports/sysutils/puppet/Makefile
--- /usr/ports/sysutils/puppet/Makefile Wed Mar 7 05:13:56 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet/Makefile Thu Mar 22 00:56:20 2007
@@ -19,6 +19,7 @@
NO_BUILD= yes
USE_RUBY= yes
+USE_RC_SUBR= puppetmasterd puppetd
DOCS= CHANGELOG TODO README LICENSE COPYING
@@ -35,7 +36,18 @@
.endfor
${INSTALL} -d ${EXAMPLESDIR}
${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
- @${CHOWN} -R root:wheel ${EXAMPLESDIR}
+ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
.endif
+
+post-install:
+ ${INSTALL} -d ${PREFIX}/etc/${PORTNAME}
+.for DIR in ssl manifests
+ ${INSTALL} -d ${PREFIX}/etc/${PORTNAME}/${DIR}
+.endfor
+ ${RUBY} ${PREFIX}/bin/puppetmasterd \
+ --confdir=${PREFIX}/etc/${PORTNAME} \
+ --genconfig | \
+ ${SED} -e 's/genconfig = true/# genconfig = false/' \
+ > ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.conf-dist
.include <bsd.port.post.mk>
diff -ruN /usr/ports/sysutils/puppet/files/puppetd.in /usr/home/cherry/svn/ports/sysutils/puppet/files/puppetd.in
--- /usr/ports/sysutils/puppet/files/puppetd.in Thu Jan 1 09:00:00 1970
+++ /usr/home/cherry/svn/ports/sysutils/puppet/files/puppetd.in Wed Mar 21 23:03:06 2007
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+
+# PROVIDE: puppetd
+# REQUIRE: NETWORK
+
+# Add the following lines to /etc/rc.conf to enable puppetd:
+#
+# puppetmasterd_enable="YES"
+
+. %%RC_SUBR%%
+
+name="puppetd"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/bin/${name}"
+command_interpreter="${prefix}/bin/ruby18"
+
+load_rc_config "$name"
+: ${puppetd_enable="NO"}
+: ${puppetd_confdir="%%PREFIX%%/etc/puppet"}
+: ${puppetd_pid="/var/run/puppet/${name}.pid"}
+: ${puppetd_flags="--confdir $puppetd_confdir "}
+command_args="$puppetd_flags"
+pidfile="$puppetd_pid"
+
+run_rc_command "$1"
diff -ruN /usr/ports/sysutils/puppet/files/puppetmasterd.in /usr/home/cherry/svn/ports/sysutils/puppet/files/puppetmasterd.in
--- /usr/ports/sysutils/puppet/files/puppetmasterd.in Thu Jan 1 09:00:00 1970
+++ /usr/home/cherry/svn/ports/sysutils/puppet/files/puppetmasterd.in Wed Mar 21 23:03:07 2007
@@ -0,0 +1,27 @@
+:#!/bin/sh
+#
+
+# PROVIDE: puppetmasterd
+# REQUIRE: NETWORK
+
+# Add the following lines to /etc/rc.conf to enable puppetmasterd:
+#
+# puppetmasterd_enable="YES"
+
+. %%RC_SUBR%%
+
+name="puppetmasterd"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/bin/${name}"
+command_interpreter="${prefix}/bin/ruby18"
+
+load_rc_config "$name"
+: ${puppetmasterd_enable="NO"}
+: ${puppetmasterd_confdir="%%PREFIX%%/etc/puppet"}
+: ${puppetmasterd_pid="/var/run/puppet/${name}.pid"}
+: ${puppetmasterd_flags="--confdir $puppetmasterd_confdir "}
+command_args="$puppetmasterd_flags"
+pidfile="$puppetmasterd_pid"
+
+run_rc_command "$1"
diff -ruN /usr/ports/sysutils/puppet/pkg-plist /usr/home/cherry/svn/ports/sysutils/puppet/pkg-plist
--- /usr/ports/sysutils/puppet/pkg-plist Wed Mar 7 05:13:56 2007
+++ /usr/home/cherry/svn/ports/sysutils/puppet/pkg-plist Thu Mar 22 00:56:07 2007
@@ -275,45 +275,49 @@
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/external
@dirrmtry %%RUBY_SITELIBDIR%%/puppet/client
@dirrmtry %%RUBY_SITELIBDIR%%/puppet
-%%DOCSDIR%%/CHANGELOG
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/README
-%%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/root/bin/sleeper
-%%EXAMPLESDIR%%/root/etc/init.d/sleeper
-%%EXAMPLESDIR%%/root/etc/puppet/puppetd.conf
-%%EXAMPLESDIR%%/root/etc/puppet/fileserver.conf
-%%EXAMPLESDIR%%/root/etc/puppet/puppetmasterd.conf
-%%EXAMPLESDIR%%/root/etc/puppet/namespaceauth.conf
-%%EXAMPLESDIR%%/root/etc/puppet/tagmail.conf
-%%EXAMPLESDIR%%/root/etc/otherfile
-%%EXAMPLESDIR%%/root/etc/configfile
-%%EXAMPLESDIR%%/root/etc/debian-passwd
-%%EXAMPLESDIR%%/root/etc/debian-syslog.conf
-%%EXAMPLESDIR%%/code/allatonce
-%%EXAMPLESDIR%%/code/head
-%%EXAMPLESDIR%%/code/selectors
-%%EXAMPLESDIR%%/code/execs
-%%EXAMPLESDIR%%/code/nodes
-%%EXAMPLESDIR%%/code/filerecursion
-%%EXAMPLESDIR%%/code/components
-%%EXAMPLESDIR%%/code/file.bl
-%%EXAMPLESDIR%%/code/groups
-%%EXAMPLESDIR%%/code/functions
-%%EXAMPLESDIR%%/code/fileparsing
-%%EXAMPLESDIR%%/code/svncommit
-%%EXAMPLESDIR%%/code/filedefaults
-%%EXAMPLESDIR%%/code/simpletests
-%%EXAMPLESDIR%%/code/assignments
-%%EXAMPLESDIR%%/code/relationships
-%%EXAMPLESDIR%%/code/importing
-%%EXAMPLESDIR%%/code/one
- at dirrmtry %%EXAMPLESDIR%%/root/bin
- at dirrmtry %%EXAMPLESDIR%%/root/etc/init.d
- at dirrmtry %%EXAMPLESDIR%%/root/etc/puppet
- at dirrmtry %%EXAMPLESDIR%%/root/etc
- at dirrmtry %%EXAMPLESDIR%%/root
- at dirrmtry %%EXAMPLESDIR%%/code
- at dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/bin/sleeper
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/init.d/sleeper
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/puppetd.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/fileserver.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/puppetmasterd.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/namespaceauth.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/tagmail.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/otherfile
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/configfile
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/debian-passwd
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/debian-syslog.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/allatonce
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/head
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/selectors
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/execs
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/nodes
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/filerecursion
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/components
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/file.bl
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/groups
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/functions
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/fileparsing
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/svncommit
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/filedefaults
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/simpletests
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/assignments
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/relationships
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/importing
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/one
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/bin
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/etc/init.d
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/etc/puppet
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/etc
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
+etc/puppet/puppet.conf-dist
+ at dirrmtry etc/puppet/ssl
+ at dirrmtry etc/puppet/manifests
+ at dirrmtry etc/puppet
--OXfL5xGRrasGEqWY--
More information about the freebsd-ports-bugs
mailing list