puppet 0.9.2 → 0.13.0

data/bin/puppetmasterd

@@ -8,51 +8,33 @@
 # = Usage
 #
 #   puppetmasterd [-h|--help] [-d|--debug] [-v|--verbose] [-V|--version]
-#               [-l|--logdest <syslog|console|<file>>] [--httplog <file>]
-#               [-m|--manifest <site manifest>] [--noca] [-p|--port <port>]
-#               [--parseonly] [-s|--ssldir <cert directory>]
-#               [-c|--confdir <configuration directory>] [--vardir <var dir>]
+#               [--noca] [--nobucket]
 #
 # = Description
 #
-# This is the standalone puppet execution script; use it to execute
-# individual scripts that you write.  If you need to execute site-wide
-# scripts, use +puppetd+ and +puppetmasterd+.
+# This is the puppet central daemon.
 #
 # = Options
 #
-# autosign::
-#   Enable autosign (which presents a potential security problem).  If enabled,
-#   refers to the autosign configuration file at /etc/puppet/autosign.conf to
-#   determine which hosts should have their certificates signed.
+# Note that any configuration parameter that's valid in the configuration file
+# is also a valid long argument.  For example, 'ssldir' is a valid configuration
+# parameter, so you can specify '--ssldir <directory>' as an argument.
 #
-# confdir::
-#   The configuration root directory, where +puppetmasterd+ defaults to looking
-#   for all of its configuration files.  Defaults to +/etc/puppet+.
+# See the configuration file for the full list of acceptable parameters.
 #
 # debug::
 #   Enable full debugging.  Causes the daemon not to go into the background.
 #
-# fsconfig::
-#   Where to find the fileserver configuration file.  Defaults to
-#   /etc/puppet/fileserver.conf.  If the fileserver config file exists,
-#   the puppetmasterd daemon will automatically also become a fileserver.
-#
 # help::
 #   Print this help message.
 #
-# httplog::
-#   Where to send http logs (which are currently separate from Puppet logs).
-#   Defaults to /var/puppet/log/http.log.
-#
 # logdest::
 #   Where to send messages.  Choose between syslog, the console, and a log file.
 #   Defaults to sending messages to /var/puppet/log/puppet.log, or the console
 #   if debugging or verbosity is enabled.
 #
-# manifest::
-#   The central site manifest to use for providing clients with their individual
-#   configurations.  Defaults to /etc/puppet/manifests/site.pp.
+# nobucket::
+#   Do not function as a file bucket.
 #
 # noca::
 #   Do not function as a certificate authority.
@@ -60,20 +42,6 @@
 # nonodes::
 #   Do not use individual node designations; each node will receive the result
 #   of evaluating the entire configuration.
-#
-# parseonly::
-#   Just parse the central manifest to verify it is syntactically correct.
-#
-# port::
-#   The port on which to listen.  Defaults to 8139.
-#
-# ssldir::
-#   The directory in which to store certificates.  Defaults to /etc/puppet/ssl.
-#
-# vardir::
-#   The variable-size directory, used for storing state.  Defaults to
-#   /var/puppet.
-#
 # verbose::
 #   Enable verbosity.  Causes the daemon not to go into the background.
 #
@@ -97,24 +65,22 @@ require 'getoptlong'
 require 'puppet'
 require 'puppet/server'
 
-result = GetoptLong.new(
-	[ "--autosign", "-a",			GetoptLong::NO_ARGUMENT ],
-	[ "--confdir",	"-c",			GetoptLong::REQUIRED_ARGUMENT ],
+options = [
 	[ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
-	[ "--fsconfig",	"-f",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
-	[ "--httplog",					GetoptLong::NO_ARGUMENT ],
 	[ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
-	[ "--manifest",	"-m",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--noca",         			GetoptLong::NO_ARGUMENT ],
+	[ "--nobucket",        			GetoptLong::NO_ARGUMENT ],
 	[ "--nonodes",         			GetoptLong::NO_ARGUMENT ],
-	[ "--parseonly",   			    GetoptLong::NO_ARGUMENT ],
-	[ "--port",	    "-p",			GetoptLong::REQUIRED_ARGUMENT ],
-	[ "--ssldir",	"-s",			GetoptLong::REQUIRED_ARGUMENT ],
-	[ "--vardir",	    			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--verbose",	"-v",			GetoptLong::NO_ARGUMENT ],
     [ "--version",  "-V",           GetoptLong::NO_ARGUMENT ]
-)
+]
+Puppet::Log.newdestination(:syslog)
+
+# Add all of the config parameters as valid options.
+Puppet.config.addargs(options)
+
+result = GetoptLong.new(*options)
 
 $haveusage = true
 
@@ -128,27 +94,26 @@ haveca = true
 master = {}
 ca = {}
 fs = {}
+bucket = {}
 args = {}
+#user = Puppet[:user]
+#group = Puppet[:group]
+user = nil
+group = nil
+
+havebucket = true
 
 parseonly = false
 
+setdest = false
+
 begin
     result.each { |opt,arg|
         case opt
-            when "--autosign"
-                ca[:autosign] = Puppet[:autosign]
-            when "--confdir"
-                Puppet[:puppetconf] = arg
             when "--debug"
-                Puppet[:debug] = true
-                Puppet[:logdest] = :console
-            when "--fsconfig"
-                unless FileTest.exists?(arg)
-                    $stderr.puts "File server configuration file %s does not exist" %
-                        arg
-                    exit(23)
-                end
-                fs[:Config] = arg
+                Puppet::Log.level = :debug
+                Puppet::Log.newdestination(:console)
+                setdest = true
             when "--help"
                 if $haveusage
                     RDoc::usage && exit
@@ -156,37 +121,28 @@ begin
                     puts "No help available unless you have RDoc::usage installed"
                     exit
                 end
-            when "--httplog"
-                args[:AccessLog] = arg
-            when "--manifest"
-                master[:File] = arg
             when "--noca"
                 haveca = false
+            when "--nobucket"
+                havebucket = false
             when "--nonodes"
                 master[:UseNodes] = false
-            when "--parseonly"
-                parseonly = true
-            when "--port"
-                args[:Port] = arg
-            when "--ssldir"
-                Puppet[:ssldir] = arg
             when "--logdest"
                 begin
-                    Puppet[:logdest] = arg
+                    Puppet::Log.newdestination(arg)
+                    setdest = true
                 rescue => detail
                     $stderr.puts detail.to_s
                 end
-            when "--vardir"
-                Puppet[:puppetvar] = arg
             when "--version"
                 puts "%s" % Puppet.version
                 exit
             when "--verbose"
-                Puppet[:loglevel] = :info
-                Puppet[:logdest] = :console
+                setdest = true
+                Puppet::Log.level = :info
+                Puppet::Log.newdestination :console
             else
-                $stderr.puts "Invalid option '#{opt}'"
-                exit(1)
+                Puppet.config.handlearg(opt, arg)
         end
     }
 rescue GetoptLong::InvalidOption => detail
@@ -198,8 +154,21 @@ rescue GetoptLong::InvalidOption => detail
     #end
     exit(1)
 end
+ca[:autosign] = Puppet[:autosign]
 
-if Puppet[:loglevel] == :debug or Puppet[:loglevel] == :info or parseonly
+# Now parse the config
+if Puppet[:config] and File.exists? Puppet[:config]
+    Puppet.config.parse(Puppet[:config])
+end
+
+Puppet.genconfig
+Puppet.genmanifest
+
+require 'etc'
+
+Puppet::Util.chuser
+
+if Puppet::Log.level == :debug or Puppet::Log.level == :info or parseonly
     args[:Daemonize] = false
 else
     args[:Daemonize] = true
@@ -211,18 +180,23 @@ handlers = {
     :Logger => {}
 }
 
+unless setdest
+    Puppet::Log.newdestination(:syslog)
+end
 
 if haveca
     handlers[:CA] = ca
 end
 
-unless fs.include?(:Config)
-    if File.exists?(Puppet[:fileserverconfig])
-        fs[:Config] = Puppet[:fileserverconfig]
-    #else
-    #    Puppet.notice "File server config %s does not exist; skipping file serving" %
-    #        Puppet[:fileserverconfig]
-    end
+#if havebucket
+#    handlers[:FileBucket] = bucket
+#end
+
+if File.exists?(Puppet[:fileserverconfig])
+    fs[:Config] = Puppet[:fileserverconfig]
+#else
+#    Puppet.notice "File server config %s does not exist; skipping file serving" %
+#        Puppet[:fileserverconfig]
 end
 
 if fs.include?(:Config)
@@ -240,14 +214,21 @@ rescue => detail
     exit(1)
 end
 
-if parseonly
+if Puppet[:parseonly]
     # we would have already exited if the file weren't syntactically correct
     exit(0)
 end
 
+if args[:Daemonize]
+    server.daemonize
+end
+
 trap(:INT) {
     server.shutdown
 }
+
+Puppet.notice "Starting Puppet server version %s" % [Puppet.version]
+
 begin
     server.start
 rescue => detail
@@ -255,4 +236,4 @@ rescue => detail
     exit(1)
 end
 
-# $Id: puppetmasterd 732 2005-10-28 05:39:59Z luke $
+# $Id: puppetmasterd 873 2006-02-07 23:12:33Z luke $

data/conf/redhat/client.init

@@ -0,0 +1,80 @@
+#!/bin/bash
+# puppet        Init script for running the puppet client daemon
+#
+# Author:       Duane Griffin <d.griffin@psenterprise.com>
+#               David Lutterkort <dlutter@redhat.com>
+#
+# chkconfig: - 98 02
+#
+# description: Enables periodic system configuration checks through puppet.
+# processname: puppet
+# config: /etc/sysconfig/puppet
+
+PATH=/usr/bin:/sbin:/bin:/usr/sbin
+export PATH
+
+[ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
+lockfile=${LOCKFILE-/var/lock/subsys/puppet}
+pidfile=${PIDFILE-/var/run/puppet.pid}
+puppetd=${PUPPETD-/usr/sbin/puppetd}
+RETVAL=0
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+PUPPET_OPTS=""
+[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
+[ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
+[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
+
+start() {
+	echo -n $"Starting puppetd: "
+        daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
+	RETVAL=$?
+	echo
+        [ $RETVAL = 0 ] && touch ${lockfile}
+        return $RETVAL
+}
+
+stop() {
+	echo -n $"Stopping puppetd: "
+        killproc $puppetd
+	RETVAL=$?
+	echo
+	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+}
+
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop) 
+	stop
+	;;
+  restart|force-reload)
+	restart
+	;;
+  reload)
+        restart
+	;;
+  condrestart)
+	[ -f "$pidfile" ] && restart
+	;;
+  status)
+        status $puppetd
+	;;
+  once)
+        shift
+        $puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
+        ;;
+  *)
+	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
+	exit 1
+esac
+
+exit $RETVAL

data/conf/redhat/client.sysconfig

@@ -0,0 +1,11 @@
+# The puppetmaster server
+#PUPPET_SERVER=puppet
+
+# If you wish to specify the port to connect to do so here
+#PUPPET_PORT=8140
+
+# Where to log to. Specify syslog to send log messages to the system log.
+#PUPPET_LOG=syslog
+
+# You may specify other parameters to the puppet client here
+#PUPPET_EXTRA_OPTS=--waitforcert=500

data/conf/redhat/fileserver.conf

@@ -0,0 +1,12 @@
+# This file consists of arbitrarily named sections/modules
+# defining where files are served from and to whom
+
+# Define a section 'files'
+# Adapt the allow/deny settings to your needs. Order
+# for allow/deny does not matter, allow always takes precedence
+# over deny
+[files]
+  path /var/puppet/files
+#  allow *.example.com
+#  deny *.evil.example.com
+#  allow 192.168.0.0/24

data/conf/redhat/puppet.spec

@@ -0,0 +1,130 @@
+%define rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
+%define _pbuild %{_builddir}/%{name}-%{version}
+%define confdir conf/redhat
+
+Summary: A network tool for managing many disparate systems
+Name: puppet
+Version: 0.13.0
+Release: 1%{?dist}
+License: GPL
+Group: System Environment/Base
+
+URL: http://reductivelabs.com/projects/puppet/
+Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+
+Requires: ruby >= 1.8.1
+Requires: facter >= 1.1
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArchitectures: noarch
+
+%description
+Puppet lets you centrally manage every important aspect of your system using a 
+cross-platform specification language that manages all the separate elements 
+normally aggregated in different files, like users, cron jobs, and hosts, 
+along with obviously discrete elements like packages, services, and files.
+
+%package server
+Group: System Environment/Base
+Summary: Server for the puppet system management tool
+Requires: puppet = %{version}-%{release}
+
+%description server
+Provides the central puppet server daemon which provides manifests to clients.
+The server can also function as a certificate authority and file server.
+
+%prep
+%setup -q
+
+%install
+%{__rm} -rf %{buildroot}
+%{__install} -d -m0755 %{buildroot}%{_sbindir}
+%{__install} -d -m0755 %{buildroot}%{_bindir}
+%{__install} -d -m0755 %{buildroot}%{rubylibdir}
+%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
+%{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
+%{__install} -d -m0755 %{buildroot}%{_localstatedir}/puppet
+%{__install} -Dp -m0755 %{_pbuild}/bin/* %{buildroot}%{_sbindir}
+%{__mv} %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
+%{__install} -Dp -m0644 %{_pbuild}/lib/puppet.rb %{buildroot}%{rubylibdir}/puppet.rb
+%{__cp} -a %{_pbuild}/lib/puppet %{buildroot}%{rubylibdir}
+%{__install} -Dp -m0644 %{confdir}/client.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppet
+%{__install} -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet
+%{__install} -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster
+%{__install} -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
+%{__install} -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
+
+%files
+%defattr(-, root, root, 0755)
+%{_bindir}/puppet
+%{_sbindir}/puppetd
+%{rubylibdir}/*
+%{_localstatedir}/puppet
+%{_initrddir}/puppet
+%config(noreplace) %{_sysconfdir}/sysconfig/puppet
+%doc CHANGELOG COPYING LICENSE README TODO examples
+%exclude %{_sbindir}/puppetdoc
+
+%files server
+%{_sbindir}/puppetmasterd
+%{_initrddir}/puppetmaster
+%config(noreplace) %{_sysconfdir}/puppet/*
+%config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
+%config(noreplace) %{_sysconfdir}/puppet/fileserver.conf
+%{_sbindir}/cf2puppet
+%{_sbindir}/puppetca
+
+%post
+touch %{_localstatedir}/log/puppet.log
+/sbin/chkconfig --add puppet
+exit 0
+
+%post server
+touch %{_localstatedir}/log/puppetmaster.log
+touch %{_localstatedir}/log/puppetmaster-http.log
+/sbin/chkconfig --add puppetmaster
+
+%preun
+if [ "$1" = 0 ] ; then
+	/sbin/service puppet stop > /dev/null 2>&1
+	/sbin/chkconfig --del puppet
+fi
+
+%preun server
+if [ "$1" = 0 ] ; then
+	/sbin/service puppetmaster stop > /dev/null 2>&1
+	/sbin/chkconfig --del puppetmaster
+fi
+
+%postun server
+if [ "$1" -ge 1 ]; then
+	 /sbin/service puppetmaster condrestart > /dev/null 2>&1
+fi
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%changelog
+* Mon Feb  6 2006 David Lutterkort <dlutter@redhat.com> - 0.12.1-1
+- Don't mark initscripts as config files
+
+* Mon Feb  6 2006 David Lutterkort <dlutter@redhat.com> - 0.12.0-2
+- Fix BuildRoot. Add dist to release
+
+* Tue Jan 17 2006 David Lutterkort <dlutter@redhat.com> - 0.11.0-1
+- Rebuild
+
+* Thu Jan 12 2006 David Lutterkort <dlutter@redhat.com> - 0.10.2-1
+- Updated for 0.10.2 Fixed minor kink in how Source is given
+
+* Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 0.10.1-3
+- Added basic fileserver.conf
+
+* Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 0.10.1-1
+- Updated. Moved installation of library files to sitelibdir. Pulled 
+initscripts into separate files. Folded tools rpm into server
+
+* Thu Nov 24 2005 Duane Griffin <d.griffin@psenterprise.com>
+- Added init scripts for the client
+
+* Wed Nov 23 2005 Duane Griffin <d.griffin@psenterprise.com>
+- First packaging