[csw-devel] SF.net SVN: gar:[6316] csw/mgar/pkg/puppet/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Wed Sep 16 12:56:09 CEST 2009
Revision: 6316
http://gar.svn.sourceforge.net/gar/?rev=6316&view=rev
Author: wahwah
Date: 2009-09-16 10:56:09 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
puppet: Using cswclassutils, separating CSWpuppetmaster, version bump to 0.25.0.
Modified Paths:
--------------
csw/mgar/pkg/puppet/trunk/Makefile
csw/mgar/pkg/puppet/trunk/checksums
csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall
csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove
csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall
csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove
Added Paths:
-----------
csw/mgar/pkg/puppet/trunk/files/cswusergroup
Removed Paths:
-------------
csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec
csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml
csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml
csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd
csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd
Property Changed:
----------------
csw/mgar/pkg/puppet/trunk/Makefile
csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall
csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove
csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall
csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove
Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile 2009-09-16 01:53:44 UTC (rev 6315)
+++ csw/mgar/pkg/puppet/trunk/Makefile 2009-09-16 10:56:09 UTC (rev 6316)
@@ -1,58 +1,66 @@
+# Copyright 2009 OpenCSW
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
GARNAME = puppet
-GARVERSION = 0.24.7
+GARVERSION = 0.25.0
CATEGORIES = apps
-DESCRIPTION = a system configuration tool
define BLURB
Long description
endef
MASTER_SITES = http://reductivelabs.com/downloads/puppet/
-DISTFILES = $(GARNAME)-$(GARVERSION).tgz
-DISTFILES += $(call admfiles,CSWpuppet,preinstall postinstall preremove postremove)
-DISTFILES += cswpuppetd cswpuppetd.xml cswpuppetmasterd cswpuppetmasterd.xml
-DISTFILES += svc-cswpuppetd svc-cswpuppetmasterd
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/
+INITSMF = $(sysconfdir)/init\.d/cswpuppetd
+INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd
+USERGROUP = $(sysconfdir)/pkg/CSWpuppet/cswusergroup
+
+# Creating a separate package CSWpuppetmaster so that the cswpuppetmaster
+# service isn't started upon the installation of CSWpuppet.
+PACKAGES = CSWpuppet CSWpuppetmaster
+
REQUIRED_PKGS = CSWfacter
+REQUIRED_PKGS_CSWpuppetmaster = CSWpuppet
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd
+SPKG_DESC_CSWpuppet = System configuration management tool, client daemon
+SPKG_DESC_CSWpuppetmaster = System configuration management tool, server
ARCHALL=1
-CONFIGURE_SCRIPTS = none
-BUILD_SCRIPTS = none
-TEST_SCRIPTS = none
+sysconfdir = /etc/opt/csw
+localstatedir = /var/opt/csw
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
INSTALL_SCRIPTS = puppet
include gar/category.mk
-configure-none:
- @$(MAKECOOKIE)
-
-test-none:
- @$(MAKECOOKIE)
-
-build-none:
- @$(MAKECOOKIE)
-
install-puppet:
@ginstall -d $(DESTDIR)
- @ginstall -d $(DESTDIR)/etc/opt/csw/puppet
- @ginstall -d $(DESTDIR)/var/opt/csw/puppet/run
- @ginstall -d $(DESTDIR)/opt/csw/var/svc/manifest
- @ginstall -d $(DESTDIR)/opt/csw/lib/svc/method
+ @ginstall -d $(DESTDIR)$(sysconfdir)/puppet
+ @ginstall -d $(DESTDIR)$(localstatedir)/puppet/run
+ ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/init.d
+ ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(sysconfdir)/init.d
+ ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(sysconfdir)/init.d
(cd $(WORKDIR)/$(DISTNAME) ; \
- gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" < ./lib/puppet/defaults.rb > ./lib/puppet/defaults.rb.csw && gmv ./lib/puppet/defaults.rb.csw ./lib/puppet/defaults.rb; \
- gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" < ./lib/puppet/defaults.rb > ./lib/puppet/defaults.rb.csw && gmv ./lib/puppet/defaults.rb.csw ./lib/puppet/defaults.rb; \
- DESTDIR=$(DESTDIR) ruby install.rb ; \
- cd $(DESTDIR)$(mandir)/man8 ; \
- gunzip * )
+ gsed -e "s|/var/puppet|/var/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \
+ gsed -e "s|/etc/puppet|/etc/opt/csw/puppet|g" -i ./lib/puppet/defaults.rb; \
+ gsed -e "s|/var/run/puppet|/var/opt/csw/puppet/run|g" -i ./lib/puppet/defaults.rb; \
+ DESTDIR=$(DESTDIR) ruby install.rb; \
+ cd $(DESTDIR)$(mandir)/man8 && gunzip *)
(cd $(WORKDIR)/$(DISTNAME)/examples/etc/puppet ; \
for f in *; do \
if [ -f $$f ] ; then \
- cp $$f $(DESTDIR)/etc/opt/csw/puppet/$$f.example; \
- chmod 644 $(DESTDIR)/etc/opt/csw/puppet/$$f.example; \
+ cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \
+ chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \
fi \
- done )
+ done)
@$(MAKECOOKIE)
Property changes on: csw/mgar/pkg/puppet/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: csw/mgar/pkg/puppet/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet/trunk/checksums 2009-09-16 01:53:44 UTC (rev 6315)
+++ csw/mgar/pkg/puppet/trunk/checksums 2009-09-16 10:56:09 UTC (rev 6316)
@@ -1,12 +1,4 @@
-36f57de5c2e069d04752f0539034227d download/puppet-0.24.7.tgz
-a8dc43771843b852f506f1795231d6ee download/CSWpuppet.gspec
-11c352613cf14412565f26dde2dc7578 download/CSWpuppet.preinstall
-b3a1e3bb293bf607368f3479b288f6eb download/CSWpuppet.postinstall
-2465374a83d4fbe6e01b6eac410e62a8 download/CSWpuppet.preremove
-2b76d69202476fad006d27d26364e59c download/CSWpuppet.postremove
ecf6aae7bb8bd8ad9e064ed40674a7be download/cswpuppetd
-dd10b02543d22bbe66994ef89409f7fd download/cswpuppetd.xml
066f9053e1342b19cf83f3f78ce2259c download/cswpuppetmasterd
-38e007c1906fca70bc95dc45b5892581 download/cswpuppetmasterd.xml
-ecf6aae7bb8bd8ad9e064ed40674a7be download/svc-cswpuppetd
-066f9053e1342b19cf83f3f78ce2259c download/svc-cswpuppetmasterd
+3ab0d4f9801075bc78b68b766b496fc7 download/cswusergroup
+8900ff87260219020949ee0d21a7a1ff download/puppet-0.25.0.tar.gz
Deleted: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec 2009-09-16 01:53:44 UTC (rev 6315)
+++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.gspec 2009-09-16 10:56:09 UTC (rev 6316)
@@ -1,5 +0,0 @@
-%var bitname puppet
-%var pkgname CSWpuppet
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/LICENCE
-%include url file://%{PKGLIB}/smf_enabled.gspec
Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2009-09-16 01:53:44 UTC (rev 6315)
+++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall 2009-09-16 10:56:09 UTC (rev 6316)
@@ -1,12 +1,24 @@
-PKG_INSTALL_ROOT=\${PKG_INSTALL_ROOT:-/}
-/usr/bin/test -d \$PKG_INSTALL_ROOT/opt/csw/etc/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /etc/opt/csw/puppet /opt/csw/etc/puppet
-/usr/bin/test -d \$PKG_INSTALL_ROOT/etc/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /opt/csw/etc/puppet /etc/puppet
-/usr/bin/test -d \$PKG_INSTALL_ROOT/opt/csw/var/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /opt/csw/var/puppet
-/usr/bin/test -d \$PKG_INSTALL_ROOT/var/puppet || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /var/puppet
-touch \$PKG_INSTALL_ROOT/etc/opt/csw/puppet/puppet.conf
-/usr/bin/test -f \$PKG_INSTALL_ROOT/opt/csw/etc/csw.conf && . \$PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
-/usr/bin/test -f \$PKG_INSTALL_ROOT/etc/opt/csw/csw.conf && . \$PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
-if [ "\$autoenable_daemons" != "no" ] ; then
- /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/svccfg import /opt/csw/var/svc/manifest/puppetd.xml || /bin/true
- /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/svcadm enable svc:network/puppetd || /bin/true
+#!/bin/sh
+#
+# $Id$
+#
+
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/}
+
+# Migration of the configuration files?
+/usr/bin/test -d $PKG_INSTALL_ROOT/opt/csw/etc/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /etc/opt/csw/puppet /opt/csw/etc/puppet
+/usr/bin/test -d $PKG_INSTALL_ROOT/etc/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /opt/csw/etc/puppet /etc/puppet
+/usr/bin/test -d $PKG_INSTALL_ROOT/opt/csw/var/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /opt/csw/var/puppet
+/usr/bin/test -d $PKG_INSTALL_ROOT/var/puppet || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/bin/ln -s /var/opt/csw/puppet /var/puppet
+
+# Replaced with INITSMF
+
+exit 0
+
+touch $PKG_INSTALL_ROOT/etc/opt/csw/puppet/puppet.conf
+/usr/bin/test -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf && . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
+/usr/bin/test -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf && . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
+if [ "$autoenable_daemons" != "no" ] ; then
+ /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/svccfg import /opt/csw/var/svc/manifest/puppetd.xml || /bin/true
+ /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/svcadm enable svc:network/puppetd || /bin/true
fi
Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postinstall
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove 2009-09-16 01:53:44 UTC (rev 6315)
+++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove 2009-09-16 10:56:09 UTC (rev 6316)
@@ -1,3 +1,10 @@
+#!/bin/sh
+#
+# $Id$
+#
+
+# Not sure if this cleanup is the right thing to do. TODO(maciej): review
+
rm /etc/puppet || /bin/true
rm /opt/csw/etc/puppet || /bin/true
rm /var/puppet || /bin/true
@@ -2 +9,2 @@
rm /opt/csw/var/puppet || /bin/true
+rm -rf /opt/csw/lib/ruby/site_ruby/1.8/puppet
Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.postremove
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall 2009-09-16 01:53:44 UTC (rev 6315)
+++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall 2009-09-16 10:56:09 UTC (rev 6316)
@@ -1,6 +1,20 @@
-PKG_INSTALL_ROOT=\${PKG_INSTALL_ROOT:-/}
-\$PKG_INSTALL_ROOT/usr/sbin/chroot \$PKG_INSTALL_ROOT/ /usr/bin/getent group puppet > /dev/null || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/groupadd puppet
-\$PKG_INSTALL_ROOT/usr/sbin/chroot \$PKG_INSTALL_ROOT/ /usr/bin/getent passwd puppet > /dev/null || /usr/sbin/chroot \$PKG_INSTALL_ROOT /usr/sbin/useradd -g puppet -c "Puppet" -d /var/opt/csw/puppet -s "/bin/true" puppet
+#!/bin/sh
+#
+# $Id$
+#
-mkdir -p \$PKG_INSTALL_ROOT/etc/opt/csw/puppet
-chown root:bin \$PKG_INSTALL_ROOT/etc/opt/csw/puppet
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/}
+
+# Replaced with cswusergroup
+
+exit 0
+
+$PKG_INSTALL_ROOT/usr/sbin/chroot $PKG_INSTALL_ROOT/ /usr/bin/getent group puppet \
+ > /dev/null \
+ || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/groupadd puppet
+$PKG_INSTALL_ROOT/usr/sbin/chroot $PKG_INSTALL_ROOT/ /usr/bin/getent passwd puppet \
+ > /dev/null \
+ || /usr/sbin/chroot $PKG_INSTALL_ROOT /usr/sbin/useradd -g puppet -c "Puppet" -d /var/opt/csw/puppet -s "/bin/true" puppet
+
+mkdir -p $PKG_INSTALL_ROOT/etc/opt/csw/puppet
+chown root:bin $PKG_INSTALL_ROOT/etc/opt/csw/puppet
Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preinstall
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove 2009-09-16 01:53:44 UTC (rev 6315)
+++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove 2009-09-16 10:56:09 UTC (rev 6316)
@@ -1,2 +1,11 @@
+#!/bin/sh
+#
+# $Id$
+#
+
+# Replaced with INITSMF
+
+exit 0
+
/usr/sbin/svcadm disable svc:network/puppetd 2>/dev/null || /bin/true
/usr/sbin/svccfg delete svc:network/puppetd || /bin/true
Property changes on: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.preremove
___________________________________________________________________
Added: svn:keywords
+ Id
Deleted: csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml 2009-09-16 01:53:44 UTC (rev 6315)
+++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd.xml 2009-09-16 10:56:09 UTC (rev 6316)
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-
-<!-- Puppetd Manifest: Luke Kanies - reductivelabs.com -->
-
-<service_bundle type='manifest' name='puppetd'>
-
-
-<service
- name='network/puppetd'
- type='service'
- version='1'>
-
- <create_default_instance enabled='true'/>
- <single_instance/>
-
- <dependency name='config-file'
- grouping='require_all'
- restart_on='none'
- type='path'>
- <service_fmri value='file:///etc/opt/csw/puppet/puppet.conf'/>
- </dependency>
-
- <dependency name='loopback'
- grouping='require_all'
- restart_on='error'
- type='service'>
- <service_fmri value='svc:/network/loopback:default'/>
- </dependency>
-
- <dependency name='physical'
- grouping='require_all'
- restart_on='error'
- type='service'>
- <service_fmri value='svc:/network/physical:default'/>
- </dependency>
-
- <dependency name='fs-local'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri value='svc:/system/filesystem/local'/>
- </dependency>
-
- <exec_method
- type='method'
- name='start'
- exec='/opt/csw/lib/svc/method/svc-cswpuppetd start'
- timeout_seconds='60' />
-
- <exec_method
- type='method'
- name='stop'
- exec='/opt/csw/lib/svc/method/svc-cswpuppetd stop'
- timeout_seconds='60' />
-
- <exec_method
- type='method'
- name='refresh'
- exec='/opt/csw/lib/svc/method/svc-cswpuppetd reload'
- timeout_seconds='60' />
-
- <stability value='Unstable' />
-
- <template>
- <common_name>
- <loctext xml:lang='C'>Puppet Client Daemon</loctext>
- </common_name>
- <documentation>
- <manpage title='puppetd' section='1' />
- <doc_link name='reductivelabs.com'
- uri='http://www.reductivelabs.com/projects/puppet' />
- </documentation>
- </template>
-</service>
-
-</service_bundle>
Deleted: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml 2009-09-16 01:53:44 UTC (rev 6315)
+++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd.xml 2009-09-16 10:56:09 UTC (rev 6316)
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-
-<!-- PuppetMasterd Manifest: Luke Kanies - reductivelabs.com -->
-
-<service_bundle type='manifest' name='puppetmasterd'>
-
-
-<service
- name='network/puppetmasterd'
- type='service'
- version='1'>
-
- <create_default_instance enabled='true'/>
- <single_instance/>
-
- <dependency name='config-file'
- grouping='require_all'
- restart_on='none'
- type='path'>
- <service_fmri value='file:///etc/opt/csw/puppet/puppet.conf'/>
- </dependency>
-
- <dependency name='loopback'
- grouping='require_all'
- restart_on='error'
- type='service'>
- <service_fmri value='svc:/network/loopback:default'/>
- </dependency>
-
- <dependency name='physical'
- grouping='require_all'
- restart_on='error'
- type='service'>
- <service_fmri value='svc:/network/physical:default'/>
- </dependency>
-
- <dependency name='fs-local'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri value='svc:/system/filesystem/local'/>
- </dependency>
-
- <exec_method
- type='method'
- name='start'
- exec='/opt/csw/lib/svc/method/svc-cswpuppetmasterd start'
- timeout_seconds='60' />
-
- <exec_method
- type='method'
- name='stop'
- exec='/opt/csw/lib/svc/method/svc-cswpuppetmasterd stop'
- timeout_seconds='60' />
-
- <exec_method
- type='method'
- name='refresh'
- exec='/opt/csw/lib/svc/method/svc-cswpuppetmasterd reload'
- timeout_seconds='60' />
-
- <stability value='Unstable' />
-
- <template>
- <common_name>
- <loctext xml:lang='C'>Puppet Server Daemon</loctext>
- </common_name>
- <documentation>
- <manpage title='puppetmasterd' section='1' />
- <doc_link name='reductivelabs.com'
- uri='http://www.reductivelabs.com/projects/puppet' />
- </documentation>
- </template>
-</service>
-
-</service_bundle>
Added: csw/mgar/pkg/puppet/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/cswusergroup (rev 0)
+++ csw/mgar/pkg/puppet/trunk/files/cswusergroup 2009-09-16 10:56:09 UTC (rev 6316)
@@ -0,0 +1 @@
+puppet:puppet:Puppet configuration management:/var/opt/csw/puppet:/bin/false::
Deleted: csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd 2009-09-16 01:53:44 UTC (rev 6315)
+++ csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetd 2009-09-16 10:56:09 UTC (rev 6316)
@@ -1,66 +0,0 @@
-#!/bin/sh
-# This is the /etc/init.d file for puppetd
-# Modified for CSW
-#
-# description: puppetd - Puppet Automation Client
-#
-
-. /lib/svc/share/smf_include.sh
-
-prefix=/opt/csw
-exec_prefix=/opt/csw
-sysconfdir=/opt/csw/etc
-sbindir=/opt/csw/bin
-
-pidfile=/var/opt/csw/puppet/run/puppetd.pid
-
-case "$1" in
-start)
- cd /
- # Start daemons.
-
- printf "Starting Puppet client services:"
-
- /opt/csw/bin/puppetd
-
- printf " puppetd"
- echo ""
- ;;
-stop)
- printf "Stopping Puppet client services:"
- kill `cat $pidfile`
-
- printf " puppetd"
- echo ""
- ;;
-restart)
- printf "Restarting Puppet client services:"
- kill -HUP `cat $pidfile`
-
- printf " puppetd"
- echo ""
- ;;
-reload)
- printf "Reloading Puppet client services:"
-
- kill -HUP `cat $pidfile`
-
- printf " puppetd"
- echo ""
- ;;
-status)
- if [ -f $pidfile ]; then
- pid=`cat $pidfile`
- curpid=`pgrep puppetd`
- if [ "$pid" -eq "$curpid" ]; then
- exit 0
- else
- exit 1
- fi
- else
- exit 1
- fi
-esac
-exit 0
-
-# $Id$
Deleted: csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd 2009-09-16 01:53:44 UTC (rev 6315)
+++ csw/mgar/pkg/puppet/trunk/files/svc-cswpuppetmasterd 2009-09-16 10:56:09 UTC (rev 6316)
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-
-. /lib/svc/share/smf_include.sh
-
-prefix=/opt/csw
-exec_prefix=/opt/csw
-sysconfdir=/opt/csw/etc
-sbindir=/opt/csw/sbin
-
-pidfile=/var/opt/csw/puppet/run/puppetmasterd.pid
-
-case "$1" in
-start)
- cd /
- # Start daemons.
-
- printf "Starting Puppet server services:"
-
- /opt/csw/bin/puppetmasterd
-
- printf " puppetmaster"
- echo ""
- ;;
-stop)
- printf "Stopping Puppet server services:"
- kill `cat $pidfile`
-
- printf " puppetmasterd"
- echo ""
- ;;
-restart)
- printf "Restarting Puppet server services:"
- kill -HUP `cat $pidfile`
-
- printf " puppetmasterd"
- echo ""
- ;;
-reload)
- printf "Reloading Puppet server services:"
-
- kill -HUP `cat $pidfile`
-
- printf " puppetmasterd"
- echo ""
- ;;
-status)
- if [ -f $pidfile ]; then
- pid=`cat $pidfile`
- curpid=`pgrep puppetmasterd`
- if [ "$pid" -eq "$curpid" ]; then
- exit 0
- else
- exit 1
- fi
- else
- exit 1
- fi
-esac
-exit 0
-
-# $Id$
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list