[csw-devel] SF.net SVN: gar:[6322] csw/mgar/pkg/puppet/trunk

[wahwah at users.sourceforge.net]

Revision: 6322
          http://gar.svn.sourceforge.net/gar/?rev=6322&view=rev
Author:   wahwah
Date:     2009-09-16 15:29:51 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
puppet: Version downgrade to 0.24.8, small formatting changes.

Modified Paths:
--------------
    csw/mgar/pkg/puppet/trunk/Makefile
    csw/mgar/pkg/puppet/trunk/checksums
    csw/mgar/pkg/puppet/trunk/files/cswpuppetd

Property Changed:
----------------
    csw/mgar/pkg/puppet/trunk/files/cswpuppetd
    csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd
    csw/mgar/pkg/puppet/trunk/files/cswusergroup

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2009-09-16 14:48:51 UTC (rev 6321)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2009-09-16 15:29:51 UTC (rev 6322)
@@ -1,19 +1,29 @@
 # Copyright 2009 OpenCSW
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
+#
+# Based on a build script[1] written by Gary Law.
+#
+# [1] http://garylaw.net/packages/puppet-build.sh
 
 GARNAME = puppet
-GARVERSION = 0.25.0
+GARVERSION = 0.24.8
 CATEGORIES = apps
 
 define BLURB
-  Long description
+  Puppet helps accomplish the goal of a hands-off, automated infrastructure.
+  The benefits of automated infrastructure go beyond policy-enforced
+  consistency and auditing.  The impact of hardware failure and other disaster
+  scenarios can be mitigated, as services can be quickly restored by Puppet. In
+  conjunction with virtualizaton, the ability to reliably create new systems
+  running consistent services can be leveraged to create autoscaling
+  applications as well as test systems identical to production environments.
 endef
 
 MASTER_SITES = http://reductivelabs.com/downloads/puppet/
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
 DISTFILES += cswpuppetd cswpuppetmasterd cswusergroup
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
 SPKG_SOURCEURL = http://reductivelabs.com/products/puppet/
 
 INITSMF  = $(sysconfdir)/init\.d/cswpuppetd
@@ -25,6 +35,7 @@
 PACKAGES = CSWpuppet CSWpuppetmaster
 
 REQUIRED_PKGS = CSWfacter
+PREREQUISITE_PKGS = $(REQUIRED_PKGS)
 REQUIRED_PKGS_CSWpuppetmaster = CSWpuppet
 
 PKGFILES_CSWpuppetmaster = $(sysconfdir)/init\.d/cswpuppetmasterd
@@ -44,23 +55,23 @@
 include gar/category.mk
 
 install-puppet:
-	@ginstall -d $(DESTDIR)
-	@ginstall -d $(DESTDIR)$(sysconfdir)/puppet
-	@ginstall -d $(DESTDIR)$(localstatedir)/puppet/run
+	ginstall -d $(DESTDIR)
+	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) ; \
+	(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; \
-	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 ; \
+	gsed -e "s|/var/run/puppet|/var/opt/csw/puppet/run|g" -i ./lib/puppet/defaults.rb)
+	cd $(WORKSRC) && DESTDIR=$(DESTDIR) ruby install.rb
+	cd $(DESTDIR)$(mandir)/man8 && gunzip *
+	(cd $(WORKSRC)/examples/etc/puppet && \
 	for f in *; do \
-		if [ -f $$f ] ; then \
-			cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \
-			chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \
-		fi \
+	    if [ -f $$f ] ; then \
+	        cp $$f $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \
+	        chmod 644 $(DESTDIR)$(sysconfdir)/puppet/$$f.example; \
+	    fi \
 	done)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/puppet/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet/trunk/checksums	2009-09-16 14:48:51 UTC (rev 6321)
+++ csw/mgar/pkg/puppet/trunk/checksums	2009-09-16 15:29:51 UTC (rev 6322)
@@ -1,4 +1,4 @@
-ecf6aae7bb8bd8ad9e064ed40674a7be  download/cswpuppetd
+7331526709cf8cbce59421157068c184  download/cswpuppetd
 066f9053e1342b19cf83f3f78ce2259c  download/cswpuppetmasterd
 3ab0d4f9801075bc78b68b766b496fc7  download/cswusergroup
-8900ff87260219020949ee0d21a7a1ff  download/puppet-0.25.0.tar.gz
+288d46dee00acad64d0f3ecc6d8ba6fa  download/puppet-0.24.8.tgz

Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/cswpuppetd	2009-09-16 14:48:51 UTC (rev 6321)
+++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd	2009-09-16 15:29:51 UTC (rev 6322)
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $Id$
+#
 # This is the /etc/init.d file for puppetd
 # Modified for CSW
 #
@@ -21,7 +24,7 @@
 
     printf "Starting Puppet client services:"
 
-    /opt/csw/bin/puppetd
+    ${sbindir}/puppetd
 
     printf " puppetd"
     echo ""
@@ -45,8 +48,8 @@
 
     kill -HUP `cat $pidfile`
 
-	printf " puppetd"
-	echo ""
+    printf " puppetd"
+    echo ""
     ;;
 status)
     if [ -f $pidfile ]; then
@@ -62,5 +65,3 @@
     fi
 esac
 exit 0
-
-# $Id$


Property changes on: csw/mgar/pkg/puppet/trunk/files/cswpuppetd
___________________________________________________________________
Added: svn:keywords
   + Id


Property changes on: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd
___________________________________________________________________
Added: svn:keywords
   + Id


Property changes on: csw/mgar/pkg/puppet/trunk/files/cswusergroup
___________________________________________________________________
Added: svn:keywords
   + Id


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