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

[phipsy at users.sourceforge.net]

Revision: 20466
          http://gar.svn.sourceforge.net/gar/?rev=20466&view=rev
Author:   phipsy
Date:     2013-03-15 13:38:37 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
puppet: version hup to 2.7.21; updated init scripts

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

Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile	2013-03-15 13:18:47 UTC (rev 20465)
+++ csw/mgar/pkg/puppet/trunk/Makefile	2013-03-15 13:38:37 UTC (rev 20466)
@@ -7,7 +7,7 @@
 # [1] http://garylaw.net/packages/puppet-build.sh
 
 NAME = puppet
-VERSION = 2.7.20
+VERSION = 2.7.21
 GARTYPE = v2
 
 define BLURB
@@ -45,6 +45,9 @@
 PACKAGES += CSWpuppetmaster
 PACKAGES += CSWpuppet
 
+INCOMPATIBLE_PKGS += CSWpuppet3
+INCOMPATIBLE_PKGS += CSWpuppetmaster3
+
 SPKG_DESC_CSWpuppet       = System configuration management tool, client daemon
 SPKG_DESC_CSWpuppetmaster = System configuration management tool, server
 
@@ -83,6 +86,8 @@
 CHECKPKG_OVERRIDES_CSWpuppet 	   += bad-location-of-file|file=/etc/puppet
 CHECKPKG_OVERRIDES_CSWpuppet 	   += bad-location-of-file|file=/etc/puppet/README.CSW
 CHECKPKG_OVERRIDES_CSWpuppet 	   += bad-location-of-file|file=/etc/puppet/puppet.conf.example-CSW
+CHECKPKG_OVERRIDES_CSWpuppet  		+= file-collision
+CHECKPKG_OVERRIDES_CSWpuppetmaster 	+= file-collision
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/puppet/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet/trunk/checksums	2013-03-15 13:18:47 UTC (rev 20465)
+++ csw/mgar/pkg/puppet/trunk/checksums	2013-03-15 13:38:37 UTC (rev 20466)
@@ -17,3 +17,4 @@
 210725704692a0ca7b8ffc312471796e  puppet-2.7.18.tar.gz
 ba76fa7831df53db7424a8d523465ef5  puppet-2.7.19.tar.gz
 746ebdd7ae734fb54e53bf6167f0928d  puppet-2.7.20.tar.gz
+cfea4e3f8cf268c1340aa5c295b3d7f0  puppet-2.7.21.tar.gz

Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetd
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/cswpuppetd	2013-03-15 13:18:47 UTC (rev 20465)
+++ csw/mgar/pkg/puppet/trunk/files/cswpuppetd	2013-03-15 13:38:37 UTC (rev 20466)
@@ -28,6 +28,7 @@
 prefix="/opt/csw"
 exec_prefix="/opt/csw"
 sysconfdir="/etc/opt/csw"
+bindir="/opt/csw/bin"
 sbindir="/opt/csw/sbin"
 localstatedir="/var/opt/csw"
 
@@ -37,14 +38,8 @@
 }
 
 start_puppetd() {
-    cd /
-    #confdir=`getprop puppet/confdir`
-    #vardir=`getprop puppet/vardir`
-    #ssldir=`getprop puppet/ssldir`
-    
-    # Start daemons.
-    #${sbindir}/puppetd --confdir=$confdir --vardir=$vardir --ssldir=$ssldir
-    ${sbindir}/puppetd
+    # Start daemon.
+    ${bindir}/puppet agent
 }
 
 reload_puppetd() {
@@ -67,7 +62,7 @@
     else
         zoneopts=""
     fi
-    pgrep $zoneopts puppetd
+    pgrep -f $zoneopts puppet
 }
 
 # Returns a line with certain string from a config file.

Modified: csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd	2013-03-15 13:18:47 UTC (rev 20465)
+++ csw/mgar/pkg/puppet/trunk/files/cswpuppetmasterd	2013-03-15 13:38:37 UTC (rev 20466)
@@ -17,22 +17,32 @@
 prefix=/opt/csw
 exec_prefix=/opt/csw
 sysconfdir=/etc/opt/csw
+bindir=/opt/csw/bin
 sbindir=/opt/csw/sbin
 
-pidfile=`$prefix/bin/puppet master --genconf | awk '/pidfile/ { print $3 }'`
+pidfile=`$prefix/bin/puppet master --configprint pidfile`
 
 getprop() {
     val=`/usr/bin/svcprop -p $1 $SMF_FMRI`
     [ -n "$val" ] && echo $val
 }
 
+get_current_pid() {
+    if [ -x /usr/bin/zonename ]; then
+        zone=`/usr/bin/zonename`
+        zoneopts="-z $zone"
+    else
+        zoneopts=""
+    fi
+    pgrep -f $zoneopts 'puppet master'
+}
+
 case "$1" in
 start)
-    cd /
-    # Start daemons.
+    # Start daemon.
 
     printf "Starting Puppet server services:"
-    ${sbindir}/puppetmasterd
+    ${bindir}/puppet master
 
     printf " puppetmaster"
     echo ""
@@ -62,7 +72,7 @@
 status)
     if [ -f $pidfile ]; then
         pid=`cat $pidfile`
-        curpid=`pgrep puppetmasterd`
+        curpid=`get_current_pid`
         if [ "$pid" -eq "$curpid" ]; then
             exit 0
         else

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