puppet 3.0.0.rc5 → 3.0.0.rc7

data/ext/debian/puppetmaster.postrm

@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+exit 0

data/ext/debian/puppetmaster.preinst

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+# Remove renamed configuration files which are now handled by other
+# packages
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+
+    dpkg-maintscript-helper rm_conffile \
+        /etc/logrotate.d/puppetmaster 2.7.16-1puppetlabs1 puppetmaster -- "$@"
+
+
+# For systems with dpkg < 1.15.7-2
+else
+
+    if [ -f /etc/logrotate.d/puppetmaster ]; then
+        rm /etc/logrotate.d/puppetmaster || true
+    fi
+fi
+
+
+#DEBHELPER#

data/ext/debian/rules

@@ -0,0 +1,128 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+INSTALL=install -Dp
+
+prefix := $(CURDIR)/debian/tmp
+bindir := $(prefix)/$(shell /usr/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["bindir"]')
+libdir := $(prefix)/usr/lib
+localstatedir := $(prefix)/var
+rubylibdir := $(shell /usr/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendordir"]')
+sysconfdir := $(prefix)/etc
+pkgconfdir := $(sysconfdir)/puppet
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	touch configure-stamp
+
+
+build-arch: build
+build-indep: build
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+	rm -f debian/puppet-common.logcheck.ignore.server
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(CURDIR)/install.rb --destdir=debian/tmp --bindir=/usr/bin --sitelibdir=$(rubylibdir) --ruby=/usr/bin/ruby
+
+	# strip executable bit from all the non-executable files.
+	find $(prefix)/$(rubylibdir) -type f -perm /u+x,g+x,o+x -exec chmod a-x {} \;
+	# fix the permissions on all of the directories
+	find $(prefix)/$(rubylibdir) -type d -exec chmod 755 {} \;
+
+	# Vim auto-syntax-highlighting stuff
+	$(INSTALL) -m0644 ext/vim/syntax/puppet.vim				\
+		$(CURDIR)/debian/vim-puppet/usr/share/vim/addons/syntax/
+	$(INSTALL) -m0644 ext/vim/ftdetect/puppet.vim				\
+		$(CURDIR)/debian/vim-puppet/usr/share/vim/addons/ftdetect/
+	$(INSTALL) -m0644 debian/vim-puppet.yaml				\
+		$(CURDIR)/debian/vim-puppet/usr/share/vim/registry/
+
+	# Emacs mode
+	$(INSTALL) -m0644 ext/emacs/puppet-mode.el			\
+		$(CURDIR)/debian/puppet-el/usr/share/emacs/site-lisp/puppet-mode.el
+
+	# Install the rack README as README.rack
+	$(INSTALL) -m0644 ext/rack/README \
+		$(CURDIR)/debian/puppetmaster-passenger/usr/share/doc/puppetmaster-passenger/README.rack
+	# Install the config.ru
+	$(INSTALL) -m0644 ext/rack/files/config.ru \
+		$(CURDIR)/debian/puppetmaster-passenger/usr/share/puppet/rack/puppetmasterd
+	# Install apache2 site configuration template
+	$(INSTALL) -m0644 ext/rack/files/apache2.conf \
+		$(CURDIR)/debian/puppetmaster-passenger/usr/share/puppetmaster-passenger/apache2.site.conf.tmpl
+
+	# Add ext directory
+	cp -pr ext $(CURDIR)/debian/puppet-common/usr/share/puppet
+	# Remove misc packaging artifacts not applicable to debian
+	rm -rf $(CURDIR)/debian/puppet-common/usr/share/puppet/ext/gentoo
+	rm -rf $(CURDIR)/debian/puppet-common/usr/share/puppet/ext/freebsd
+	rm -rf $(CURDIR)/debian/puppet-common/usr/share/puppet/ext/solaris
+	rm -rf $(CURDIR)/debian/puppet-common/usr/share/puppet/ext/suse
+	rm -rf $(CURDIR)/debian/puppet-common/usr/share/puppet/ext/windows
+	rm -rf $(CURDIR)/debian/puppet-common/usr/share/puppet/ext/redhat
+	rm -rf $(CURDIR)/debian/puppet-common/usr/share/puppet/ext/ips
+	rm -rf $(CURDIR)/debian/puppet-common/usr/share/puppet/ext/osx
+	rm -rf $(CURDIR)/debian/puppet-common/usr/share/puppet/ext/build_defaults.yaml
+	rm -rf $(CURDIR)/debian/puppet-common/usr/share/puppet/ext/project_data.yaml
+
+	dh_installexamples -p puppet-common examples/*
+
+	$(INSTALL) -d -m0775 $(pkgconfdir)/templates
+	$(INSTALL) -d -m0775 $(pkgconfdir)/modules
+
+	# Logcheck rules.  Gee I wish you could specify a file to source
+	# in dh_installlogcheck.
+	ln ext/logcheck/puppet debian/puppet-common.logcheck.ignore.server
+
+# Build architecture-dependent files here.
+binary-arch: build install
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_install -i
+	dh_installdocs -i
+	dh_installemacsen
+	dh_installlogcheck
+	dh_installman
+	dh_installinit -ppuppetmaster
+	dh_installinit --name=puppetqd
+	dh_installinit -ppuppet --error-handler=true -- defaults 21
+	dh_installlogrotate -i
+	dh_lintian -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

data/ext/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

data/ext/debian/source/options

@@ -0,0 +1 @@
+single-debian-patch

data/ext/debian/vim-puppet.README.Debian

@@ -0,0 +1,13 @@
+Dear user, this package provides the vim addon puppet, but it is not enabled
+per default.
+
+If you want to enable it for your user account just execute
+
+	vim-addons install puppet
+
+Similarly, to enable it for all users of this system just execute (as root):
+
+	vim-addons -w install puppet
+
+vim-addons is provided by the vim-addon-manager package, have a look at its
+manpage for more information.

data/ext/debian/vim-puppet.dirs

@@ -0,0 +1,3 @@
+usr/share/vim/registry
+usr/share/vim/addons/syntax
+usr/share/vim/addons/ftdetect

data/ext/debian/vim-puppet.yaml

@@ -0,0 +1,5 @@
+addon: puppet
+description: "Syntax highlighting for puppet"
+files:
+  - ftdetect/puppet.vim
+  - syntax/puppet.vim

data/ext/debian/watch

@@ -0,0 +1,2 @@
+version=3
+http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/puppet .*/puppet-(.*).tar.gz

data/ext/emacs/puppet-mode.el

@@ -386,6 +386,7 @@ The variable puppet-indent-level controls the amount of indentation.
   (setq mode-name "Puppet")
   (setq major-mode 'puppet-mode)
   (set-syntax-table puppet-mode-syntax-table)
+  (set (make-local-variable 'parse-sexp-ignore-comments) t)
   (set (make-local-variable 'local-abbrev-table) puppet-mode-abbrev-table)
   (set (make-local-variable 'comment-start) "# ")
   (set (make-local-variable 'comment-start-skip) "#+ *")

data/ext/envpuppet

@@ -93,6 +93,10 @@ myrubylib="${ENVPUPPET_BASEDIR}/puppet/lib"
 mypath="${mypath}:${ENVPUPPET_BASEDIR}/facter/bin"
 myrubylib="${myrubylib}:${ENVPUPPET_BASEDIR}/facter/lib"
 
+# git://github.com/puppetlabs/hiera.git
+mypath="${mypath}:${ENVPUPPET_BASEDIR}/hiera/bin"
+myrubylib="${myrubylib}:${ENVPUPPET_BASEDIR}/hiera/lib"
+
 if [[ "${ENVPUPPET_BLEEDING:-}" == "true" ]]; then
   # git://github.com/puppetlabs/facter.git
   mypath="${mypath}:${ENVPUPPET_BASEDIR}/puppet-interfaces/bin"

data/ext/envpuppet.bat

@@ -5,9 +5,10 @@ REM net use Z: "\\vmware-host\Shared Folders" /persistent:yes
 
 SET PUPPET_DIR=%~dp0..
 SET FACTER_DIR=%PUPPET_DIR%\..\facter
+SET HIERA_DIR=%PUPPET_DIR%\..\hiera
 
-SET PATH=%PUPPET_DIR%\bin;%FACTER_DIR%\bin;%PATH%
-SET RUBYLIB=%PUPPET_DIR%\lib;%FACTER_DIR%\lib;%RUBYLIB%
+SET PATH=%PUPPET_DIR%\bin;%FACTER_DIR%\bin;%HIERA_DIR%\bin;%PATH%
+SET RUBYLIB=%PUPPET_DIR%\lib;%FACTER_DIR%\lib;%HIERA_DIR%\lib;%RUBYLIB%
 SET RUBYLIB=%RUBYLIB:\=/%
 
 ruby -S %*

data/ext/ips/puppet-agent

@@ -0,0 +1,49 @@
+#!/sbin/sh
+# It needs the smf property puppet-agent/server to be set to where the server is.
+# svccfg -s svc:/network/puppet/agent setprop server/name=asstring:localhost
+
+
+. /lib/svc/share/smf_include.sh
+
+[[ -z "${SMF_FMRI}" ]] && exit $SMF_EXIT_ERR
+
+typeset -r CONF_FILE=/etc/puppet/puppet.conf
+[[ ! -f "${CONF_FILE}" ]] && exit $SMF_EXIT_ERR_CONFIG
+
+typeset -r PUPPET=/usr/bin/puppet
+typeset -r PUPPET_SERVER=$(svcprop -p server/name $SMF_FMRI)
+[[ -z "${PUPPET_SERVER}" ]] && exit $SMF_EXIT_ERR_CONFIG
+
+case "$1" in
+start)
+  exec $PUPPET agent --daemonize --server $PUPPET_SERVER
+  ;;
+
+stop)
+  # stop sends sigterm first followed by sigkill
+  # smf_kill_contract <CTID> TERM 1 30
+  # sends sigterm to all process in ctid and will continue
+  # to do so for 30 seconds with interval of 5 seconds
+  # smf_kill_contract <CTID> KILL 1
+  # continues until all processes are killed.
+  # svcs -p <fmri> lists all processes in the contract.
+  # http://bnsmb.de/solaris/My_Little_SMF_FAQ.html
+  ctid=`svcprop -p restarter/contract $SMF_FMRI`
+  if [ -n "$ctid" ]; then
+    smf_kill_contract $ctid TERM 1 5
+    ret=$?
+    [ $ret -eq 1 ] && exit $SMF_EXIT_ERR_FATAL
+
+    if [ $ret -eq 2 ] ; then
+      smf_kill_contract $ctid KILL 1
+      [ $? -ne 0 ] && exit $SMF_EXIT_ERR_FATAL
+    fi
+  fi
+  ;;
+*)
+  echo "Usage: $0 {start|stop}";
+  exit $SMF_EXIT_ERR_FATAL
+  ;;
+esac
+exit $SMF_EXIT_OK
+

data/ext/ips/puppet-master

@@ -0,0 +1,44 @@
+#!/sbin/sh
+
+. /lib/svc/share/smf_include.sh
+
+[[ -z "${SMF_FMRI}" ]] && exit $SMF_EXIT_ERR
+
+typeset -r CONF_FILE=/etc/puppet/puppet.conf
+[[ ! -f ${CONF_FILE} ]] && exit $SMF_EXIT_ERR_CONFIG
+typeset -r PUPPET=/usr/bin/puppet
+
+case "$1" in
+start)
+  exec $PUPPET master --daemonize
+  ;;
+
+stop)
+  # stop sends sigterm first followed by sigkill
+  # smf_kill_contract <CTID> TERM 1 30
+  # sends sigterm to all process in ctid and will continue
+  # to do so for 30 seconds with interval of 5 seconds
+  # smf_kill_contract <CTID> KILL 1
+  # continues until all processes are killed.
+  # svcs -p <fmri> lists all processes in the contract.
+  # http://bnsmb.de/solaris/My_Little_SMF_FAQ.html
+
+  ctid=`svcprop -p restarter/contract $SMF_FMRI`
+  if [ -n "$ctid" ]; then
+    smf_kill_contract $ctid TERM 1 5
+    ret=$?
+    [ $ret -eq 1 ] && exit $SMF_EXIT_ERR_FATAL
+
+    if [ $ret -eq 2 ] ; then
+      smf_kill_contract $ctid KILL 1
+      [ $? -ne 0 ] && exit $SMF_EXIT_ERR_FATAL
+    fi
+  fi
+  ;;
+*)
+  echo "Usage: $0 {start|stop}";
+  exit $SMF_EXIT_ERR_FATAL
+  ;;
+esac
+exit $SMF_EXIT_OK
+

data/ext/ips/puppet.conf

@@ -0,0 +1,29 @@
+
+[main]
+    vardir = /var/lib/puppet
+
+    # The Puppet log directory.
+    # The default value is '$vardir/log'.
+    logdir = /var/log/puppet
+
+    # Where Puppet PID files are kept.
+    # The default value is '$vardir/run'.
+    rundir = /var/run/puppet
+
+    # Where SSL certificates are kept.
+    # The default value is '$confdir/ssl'.
+    ssldir = $vardir/ssl
+
+[agent]
+    # The file in which puppetd stores a list of the classes
+    # associated with the retrieved configuratiion.  Can be loaded in
+    # the separate ``puppet`` executable using the ``--loadclasses``
+    # option.
+    # The default value is '$confdir/classes.txt'.
+    classfile = $vardir/classes.txt
+
+    # Where puppetd caches the local configuration.  An
+    # extension indicating the cache format is added automatically.
+    # The default value is '$confdir/localconfig'.
+    localconfig = $vardir/localconfig
+

data/ext/ips/puppet.p5m.erb

@@ -0,0 +1,12 @@
+set name=pkg.fmri value=pkg://puppetlabs.com/system/management/<%=@name%>@<%=@ipsversion%>
+set name=pkg.summary value="<%=@summary%>"
+set name=pkg.human-version value="<%=@version%>"
+set name=pkg.description value="<%=@description%>"
+set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
+set name=org.opensolaris.consolidation value="puppet"
+set name=description value="<%=@description%>"
+set name=variant.opensolaris.zone value=global value=nonglobal
+set name=variant.arch value=sparc value=i386
+license puppet.license license="Apache v2.0"
+group groupname=puppet
+user username=puppet password='*NP*' group=puppet

data/ext/ips/puppetagent.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="puppet:agent">
+
+  <service name="network/puppet/agent" 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/puppet/puppet.conf"/>
+    </dependency>
+
+    <dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'>
+        <service_fmri value='svc:/system/filesystem/local:default'/>
+    </dependency>
+
+    <dependency name='network' grouping='require_all' restart_on='error' type='service'>
+        <service_fmri value='svc:/milestone/network: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="/lib/svc/method/puppet-agent start" timeout_seconds="60"/>
+
+    <exec_method type="method" name="stop" exec="/lib/svc/method/puppet-agent stop" timeout_seconds="60"/>
+
+    <property_group name='server' type='framework'>
+      <propval name='name' type='astring' value='puppet' />
+    </property_group>
+
+    <stability value="Evolving"/>
+
+    <template>
+      <common_name>
+        <loctext xml:lang="C">Puppet Agent Daemon</loctext>
+      </common_name>
+      <documentation>
+        <manpage title="puppet" section="1"/>
+        <doc_link name="puppetlabs.com" uri="http://puppetlabs.com/puppet/introduction"/>
+      </documentation>
+    </template>
+  </service>
+
+</service_bundle>

data/ext/ips/puppetmaster.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="puppet:master">
+
+  <service name="network/puppet/master" 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/puppet/puppet.conf"/>
+    </dependency>
+
+    <dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'>
+        <service_fmri value='svc:/system/filesystem/local:default'/>
+    </dependency>
+
+    <dependency name='network' grouping='require_all' restart_on='error' type='service'>
+        <service_fmri value='svc:/milestone/network: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="/lib/svc/method/puppet-master start" timeout_seconds="60"/>
+
+    <exec_method type="method" name="stop" exec="/lib/svc/method/puppet-master stop" timeout_seconds="60"/>
+
+  <stability value="Evolving"/>
+
+    <template>
+      <common_name>
+        <loctext xml:lang="C">Puppet Master Daemon</loctext>
+      </common_name>
+      <documentation>
+        <manpage title="puppet" section="1"/>
+        <doc_link name="puppetlabs.com" uri="http://puppetlabs.com/puppet/introduction"/>
+      </documentation>
+    </template>
+  </service>
+
+</service_bundle>