[csw-devel] SF.net SVN: gar:[13536] csw/mgar/pkg/puppet/trunk
phipsy at users.sourceforge.net
phipsy at users.sourceforge.net
Wed Mar 2 20:22:25 CET 2011
Revision: 13536
http://gar.svn.sourceforge.net/gar/?rev=13536&view=rev
Author: phipsy
Date: 2011-03-02 19:22:25 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
Starting to update puppet for 2.6.5 - work in progress
Modified Paths:
--------------
csw/mgar/pkg/puppet/trunk/Makefile
csw/mgar/pkg/puppet/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/puppet/trunk/files/puppetd.xml
csw/mgar/pkg/puppet/trunk/files/puppetmaster.xml
Removed Paths:
-------------
csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root
Modified: csw/mgar/pkg/puppet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/puppet/trunk/Makefile 2011-03-02 17:28:18 UTC (rev 13535)
+++ csw/mgar/pkg/puppet/trunk/Makefile 2011-03-02 19:22:25 UTC (rev 13536)
@@ -7,7 +7,7 @@
# [1] http://garylaw.net/packages/puppet-build.sh
NAME = puppet
-VERSION = 2.6.4
+VERSION = 2.6.5
CATEGORIES = apps
define BLURB
@@ -20,18 +20,17 @@
applications as well as test systems identical to production environments.
endef
-MASTER_SITES = http://reductivelabs.com/downloads/puppet/
+MASTER_SITES = http://puppetlabs.com/downloads/puppet/
DISTFILES = $(NAME)-$(VERSION).tar.gz
DISTFILES += cswpuppetd
DISTFILES += cswpuppetmasterd
DISTFILES += cswusergroup
-DISTFILES += CSWpuppet.cron.root
+DISTFILES += puppetd.xml
+DISTFILES += puppetmaster.xml
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-SPKG_SOURCEURL = http://www.puppetlabs.com/
+SPKG_SOURCEURL = http://puppetlabs.com/
-# 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 += $(sysconfdir)/init\.d/cswpuppetd
INITSMF += $(sysconfdir)/init\.d/cswpuppetmasterd
USERGROUP = $(sysconfdir)/pkg/puppet/cswusergroup
@@ -70,8 +69,8 @@
CHECKPKG_OVERRIDES_CSWpuppet += surplus-dependency|CSWfacter
CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWpuppet
-CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs
-CRONTABS = $(CRONDIR)/root
+# CRONDIR = $(sysconfdir)/pkg/CSWpuppet/crontabs
+# CRONTABS = $(CRONDIR)/root
CHECKPKG_OVERRIDES_CSWpuppet += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswpuppetd|class=none
CHECKPKG_OVERRIDES_CSWpuppetmaster += surplus-dependency|CSWruby
# Puppet has hardcoded paths to look at for many OSes, many of which involve
@@ -118,5 +117,7 @@
# and we don't want that. It could be split off to another package, but
# this file doesn't seem to be of any use on Solaris, so we can safely
# remove it.
- rm $(DESTDIR)$(libdir)/ruby/site_ruby/1.8/puppet/provider/package/yumhelper.py
+ # markp: Putting this back in. Will look at deps later. Some places do run
+ # yum on Solaris, would you believe.
+ # rm $(DESTDIR)$(libdir)/ruby/site_ruby/1.8/puppet/provider/package/yumhelper.py
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/puppet/trunk/checksums
===================================================================
--- csw/mgar/pkg/puppet/trunk/checksums 2011-03-02 17:28:18 UTC (rev 13535)
+++ csw/mgar/pkg/puppet/trunk/checksums 2011-03-02 19:22:25 UTC (rev 13536)
@@ -1 +1,2 @@
c0b86f40c8000dae2f0f7f2f91579c2a puppet-2.6.4.tar.gz
+645543a18050f1d991796d865c53f9a4 puppet-2.6.5.tar.gz
Deleted: csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root 2011-03-02 17:28:18 UTC (rev 13535)
+++ csw/mgar/pkg/puppet/trunk/files/CSWpuppet.cron.root 2011-03-02 19:22:25 UTC (rev 13536)
@@ -1 +0,0 @@
-0,30 * * * * /opt/csw/sbin/puppetd --no-daemon --onetime
Added: csw/mgar/pkg/puppet/trunk/files/puppetd.xml
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/puppetd.xml (rev 0)
+++ csw/mgar/pkg/puppet/trunk/files/puppetd.xml 2011-03-02 19:22:25 UTC (rev 13536)
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+
+<!-- Original puppetd Manifest: Luke Kanies - reductivelabs.com -->
+<!-- Updates for OpenCSW by Mark Phillips - opencsw.org -->
+
+<service_bundle type='manifest' name='puppetd'>
+
+ <service
+ name='network/puppetd'
+ type='service'
+ version='1'>
+
+ <create_default_instance enabled='false'/>
+ <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/sbin/puppetd'
+ timeout_seconds='60' />
+
+ <exec_method
+ type='method'
+ name='stop'
+ exec=':kill'
+ 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='puppetlabs.com'
+ uri='http://puppetlabs.com/puppet/introduction' />
+ </documentation>
+ </template>
+ </service>
+
+</service_bundle>
Added: csw/mgar/pkg/puppet/trunk/files/puppetmaster.xml
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/puppetmaster.xml (rev 0)
+++ csw/mgar/pkg/puppet/trunk/files/puppetmaster.xml 2011-03-02 19:22:25 UTC (rev 13536)
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+
+<!-- Original puppetmasterd manifest: Luke Kanies - reductivelabs.com -->
+<!-- Updates for OpenCSW by Mark Phillips - opencsw.org -->
+
+<service_bundle type='manifest' name='puppetmaster'>
+
+ <service
+ name='network/puppetmaster'
+ type='service'
+ version='1'>
+
+ <create_default_instance enabled='false'/>
+ <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/sbin/puppetmasterd'
+ timeout_seconds='60' />
+
+ <exec_method
+ type='method'
+ name='stop'
+ exec=':kill'
+ 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='puppetlabs.com'
+ uri='http://puppetlabs.com/puppet/introduction' />
+ </documentation>
+ </template>
+ </service>
+
+</service_bundle>
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