[csw-devel] SF.net SVN: gar:[9941] csw/mgar/pkg/puppet/branches/puppet-0.25.x

[wahwah at users.sourceforge.net]

Revision: 9941
          http://gar.svn.sourceforge.net/gar/?rev=9941&view=rev
Author:   wahwah
Date:     2010-05-20 16:35:25 +0000 (Thu, 20 May 2010)

Log Message:
-----------
puppet-0.25.x: Upgrade to 0.25.5, and using cron istead of SMF (running via SMF sucks)

Modified Paths:
--------------
    csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile
    csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums

Added Paths:
-----------
    csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/CSWpuppet.cron.root

Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile
===================================================================
--- csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile	2010-05-20 16:26:17 UTC (rev 9940)
+++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/Makefile	2010-05-20 16:35:25 UTC (rev 9941)
@@ -7,7 +7,7 @@
 # [1] http://garylaw.net/packages/puppet-build.sh
 
 GARNAME = puppet
-GARVERSION = 0.25.4
+GARVERSION = 0.25.5
 CATEGORIES = apps
 
 define BLURB
@@ -22,17 +22,29 @@
 
 MASTER_SITES = http://reductivelabs.com/downloads/puppet/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup
+DISTFILES += cswpuppetd
+DISTFILES += cswpuppetmasterd
+DISTFILES += cswusergroup
+DISTFILES += CSWpuppet.cron.root
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/
+SPKG_SOURCEURL = http://www.puppetlabs.com/
 
-INITSMF  = $(sysconfdir)/init\.d/cswpuppetd
-INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd
+# Handy when doing multiple updates per day.  Adds hours and minutes to the
+# timestamp.
+GARFLAVOR = DBG
+
+# Disabling SMF support for puppetd.  There are problems with it.  It's a
+# better choice to run it from cron.
+# INITSMF  = $(sysconfdir)/init\.d/cswpuppetd
+INITSMF += $(prefix)/etc/init\.d/cswpuppetmasterd
 USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup
 
+CHECKPKG_OVERRIDES_CSWpuppet += init-file-missing-cswinitsmf-class|/opt/csw/etc/init.d/cswpuppetd|class=none
+
 # Creating a separate package CSWpuppetmaster so that the cswpuppetmaster
 # service isn't started upon the installation of CSWpuppet.
-PACKAGES = CSWpuppet CSWpuppetmaster
+PACKAGES += CSWpuppetmaster
+PACKAGES += CSWpuppet
 
 SPKG_DESC_CSWpuppet       = System configuration management tool, client daemon
 SPKG_DESC_CSWpuppetmaster = System configuration management tool, server
@@ -42,7 +54,7 @@
 RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWpuppet
 RUNTIME_DEP_PKGS_CSWpuppetmaster += CSWruby
 
-PKGFILES_CSWpuppetmaster  = $(sysconfdir)/init\.d/cswpuppetmasterd
+PKGFILES_CSWpuppetmaster  = $(prefix)/etc/init\.d/cswpuppetmasterd
 PKGFILES_CSWpuppetmaster += $(sbindir)/puppetmasterd
 PKGFILES_CSWpuppetmaster += $(mandir)/man8/puppetmasterd.8
 PKGFILES_CSWpuppetmaster += $(libdir)/.*/puppet/application/puppetmasterd.rb
@@ -60,18 +72,26 @@
 PATCHFILES  = 0001-pkgutil-support.patch
 PATCHFILES += 0002-Using-the-single-option-of-pkgutil.patch
 
-CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter
+CHECKPKG_OVERRIDES_CSWpuppet       += surplus-dependency|CSWfacter
 CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet
 
+CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs
+CRONTABS = $(CRONDIR)/root
+
 include gar/category.mk
 
 install-puppet:
 	ginstall -m 755 -d $(DESTDIR)
 	ginstall -m 755 -d $(DESTDIR)$(sysconfdir)/puppet
 	ginstall -m 755 -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
+	ginstall -m 755 -d $(DESTDIR)$(prefix)/etc/init.d
+	# $(sysconfdir)/pkg/<pkgname>/crontabs
+	ginstall -m 755 -d $(DESTDIR)$(CRONDIR)
+	ginstall -m 644 \
+		$(FILEDIR)/CSWpuppet.cron.root \
+		$(DESTDIR)$(CRONDIR)/root
+	ginstall -m 755 $(FILEDIR)/cswpuppetd $(DESTDIR)$(prefix)/etc/init.d
+	ginstall -m 755 $(FILEDIR)/cswpuppetmasterd $(DESTDIR)$(prefix)/etc/init.d
 	(cd $(WORKSRC) && \
 	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; \

Modified: csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums
===================================================================
--- csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums	2010-05-20 16:26:17 UTC (rev 9940)
+++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/checksums	2010-05-20 16:35:25 UTC (rev 9941)
@@ -1,6 +1,7 @@
 abaa404420106f9f28e9e1218b4e365b  0001-pkgutil-support.patch
 9c27c0cdca051eae986b56b91ef889ca  0002-Using-the-single-option-of-pkgutil.patch
+a2e6cf46cc564d1b70ddaf90eec1349d  CSWpuppet.cron.root
 0af8b2be6a2c9ecc6bb4a1878fcbefec  cswpuppetd
 aba2c79e589b9bd1c881a22aa663a213  cswpuppetmasterd
 3ab0d4f9801075bc78b68b766b496fc7  cswusergroup
-69c97019fda5620f9f45f6ad64407e3b  puppet-0.25.4.tar.gz
+2988385801c967f7262cdf08640c9e07  puppet-0.25.5.tar.gz

Added: csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/CSWpuppet.cron.root
===================================================================
--- csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/CSWpuppet.cron.root	                        (rev 0)
+++ csw/mgar/pkg/puppet/branches/puppet-0.25.x/files/CSWpuppet.cron.root	2010-05-20 16:35:25 UTC (rev 9941)
@@ -0,0 +1 @@
+30 * * * * /opt/csw/bin/puppetd --no-daemon


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.