[csw-devel] SF.net SVN: gar:[20410] csw/mgar/pkg/puppet3/trunk

[phipsy at users.sourceforge.net]

Revision: 20410
          http://gar.svn.sourceforge.net/gar/?rev=20410&view=rev
Author:   phipsy
Date:     2013-03-11 08:31:41 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
puppet3 -> 3.1.0; first hack at fixing startup scripts

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

Modified: csw/mgar/pkg/puppet3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet3/trunk/Makefile	2013-03-10 22:54:19 UTC (rev 20409)
+++ csw/mgar/pkg/puppet3/trunk/Makefile	2013-03-11 08:31:41 UTC (rev 20410)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = puppet3
-VERSION = 3.0.1
+VERSION = 3.1.0
 GARTYPE = v2
 
 define BLURB

Modified: csw/mgar/pkg/puppet3/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet3/trunk/checksums	2013-03-10 22:54:19 UTC (rev 20409)
+++ csw/mgar/pkg/puppet3/trunk/checksums	2013-03-11 08:31:41 UTC (rev 20410)
@@ -1 +1,2 @@
 2117e3a1964ac54fcd36d926eed3db94  puppet-3.0.1.tar.gz
+4cbdcc9dfcda677c820175375a500651  puppet-3.1.0.tar.gz

Modified: csw/mgar/pkg/puppet3/trunk/files/cswpuppetd
===================================================================
--- csw/mgar/pkg/puppet3/trunk/files/cswpuppetd	2013-03-10 22:54:19 UTC (rev 20409)
+++ csw/mgar/pkg/puppet3/trunk/files/cswpuppetd	2013-03-11 08:31:41 UTC (rev 20410)
@@ -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"
 
@@ -43,8 +44,7 @@
     #ssldir=`getprop puppet/ssldir`
     
     # Start daemons.
-    #${sbindir}/puppetd --confdir=$confdir --vardir=$vardir --ssldir=$ssldir
-    ${sbindir}/puppetd
+    ${bindir}/puppet agent
 }
 
 reload_puppetd() {

Modified: csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd
===================================================================
--- csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd	2013-03-10 22:54:19 UTC (rev 20409)
+++ csw/mgar/pkg/puppet3/trunk/files/cswpuppetmasterd	2013-03-11 08:31:41 UTC (rev 20410)
@@ -17,6 +17,7 @@
 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 }'`
@@ -32,7 +33,7 @@
     # Start daemons.
 
     printf "Starting Puppet server services:"
-    ${sbindir}/puppetmasterd
+    ${sbindir}/puppet master
 
     printf " puppetmaster"
     echo ""

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