puppet 0.13.0 → 0.13.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.13.1
+    Fixed RPM spec files to create puppet user and group (lutter)
+    Fixed crontab reading and writing (luke)
+    Added symbolic naming in the language (luke)
+
 0.13.0
     Added support for configuration files.
     Even more bug fixes, including the infamous 'frozen object' bug, which was a

data/Rakefile

@@ -333,6 +333,8 @@ task :update_version => [:prerelease] do
                 rakein.each do |line|
                     if line =~ /^Version:\s*/
                         rakeout.puts "Version: #{PKG_VERSION}"
+                    elsif line =~ /^Release:\s*/
+                      rakeout.puts "Release: 1%{?dist}"
                     else
                         rakeout.puts line
                     end

data/bin/puppetd

@@ -142,11 +142,9 @@ begin
             when "--verbose"
                 Puppet::Log.level = :info
                 Puppet::Log.newdestination(:console)
-                setdest = true
             when "--debug"
                 Puppet::Log.level = :debug
                 Puppet::Log.newdestination(:console)
-                setdest = true
             when "--fqdn"
                 fqdn = arg
             when "--onetime"
@@ -156,6 +154,7 @@ begin
             when "--logdest"
                 begin
                     Puppet::Log.newdestination(arg)
+                    setdest = true
                 rescue => detail
                     $stderr.puts detail.to_s
                 end
@@ -265,4 +264,4 @@ else
     Puppet.start
 end
 
-# $Id: puppetd 873 2006-02-07 23:12:33Z luke $
+# $Id: puppetd 895 2006-02-09 21:15:38Z lutter $

data/bin/puppetmasterd

@@ -113,7 +113,6 @@ begin
             when "--debug"
                 Puppet::Log.level = :debug
                 Puppet::Log.newdestination(:console)
-                setdest = true
             when "--help"
                 if $haveusage
                     RDoc::usage && exit
@@ -138,7 +137,6 @@ begin
                 puts "%s" % Puppet.version
                 exit
             when "--verbose"
-                setdest = true
                 Puppet::Log.level = :info
                 Puppet::Log.newdestination :console
             else
@@ -236,4 +234,4 @@ rescue => detail
     exit(1)
 end
 
-# $Id: puppetmasterd 873 2006-02-07 23:12:33Z luke $
+# $Id: puppetmasterd 895 2006-02-09 21:15:38Z lutter $

data/conf/redhat/client.init

@@ -15,7 +15,7 @@ export PATH
 
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppet.pid}
+pidfile=${PIDFILE-/var/run/puppet/puppet.pid}
 puppetd=${PUPPETD-/usr/sbin/puppetd}
 RETVAL=0
 
@@ -28,7 +28,7 @@ PUPPET_OPTS=""
 [ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
 
 start() {
-	echo -n $"Starting puppetd: "
+	echo -n $"Starting puppet: "
         daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
 	RETVAL=$?
 	echo
@@ -37,7 +37,7 @@ start() {
 }
 
 stop() {
-	echo -n $"Stopping puppetd: "
+	echo -n $"Stopping puppet: "
         killproc $puppetd
 	RETVAL=$?
 	echo

data/conf/redhat/client.sysconfig

@@ -5,7 +5,7 @@
 #PUPPET_PORT=8140
 
 # Where to log to. Specify syslog to send log messages to the system log.
-#PUPPET_LOG=syslog
+PUPPET_LOG=/var/log/puppet/puppet.log
 
 # You may specify other parameters to the puppet client here
 #PUPPET_EXTRA_OPTS=--waitforcert=500

data/conf/redhat/logrotate

@@ -0,0 +1,8 @@
+/var/log/puppet/*log {
+  missingok
+  create 0644 puppet puppet
+  postrotate
+    [ -e /etc/init.d/puppetmaster ] && /etc/init.d/puppetmaster condrestart >/dev/null 2>&1 || true
+    [ -e /etc/init.d/puppet ] && /etc/init.d/puppet condrestart > /dev/null 2>&1 || true
+  endscript
+}

data/conf/redhat/puppet.spec

@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.13.0
+Version: 0.13.1
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -43,6 +43,8 @@ The server can also function as a certificate authority and file server.
 %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
 %{__install} -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
 %{__install} -d -m0755 %{buildroot}%{_localstatedir}/puppet
+%{__install} -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
+%{__install} -d -m0755 %{buildroot}%{_localstatedir}/log/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
@@ -52,6 +54,9 @@ The server can also function as a certificate authority and file server.
 %{__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
+%{__install} -Dp -m0644 %{confdir}/puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
+%{__install} -Dp -m0644 %{confdir}/puppetmasterd.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
+%{__install} -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
 
 %files
 %defattr(-, root, root, 0755)
@@ -61,8 +66,14 @@ The server can also function as a certificate authority and file server.
 %{_localstatedir}/puppet
 %{_initrddir}/puppet
 %config(noreplace) %{_sysconfdir}/sysconfig/puppet
+%config(noreplace) %{_sysconfdir}/puppet/puppetd.conf
 %doc CHANGELOG COPYING LICENSE README TODO examples
 %exclude %{_sbindir}/puppetdoc
+%config(noreplace) %{_sysconfdir}/logrotate.d/puppet
+# These need to be owned by puppet so the server can
+# write to them
+%attr(-, puppet, puppet) %{_localstatedir}/run/puppet
+%attr(-, puppet, puppet) %{_localstatedir}/log/puppet
 
 %files server
 %{_sbindir}/puppetmasterd
@@ -70,9 +81,16 @@ The server can also function as a certificate authority and file server.
 %config(noreplace) %{_sysconfdir}/puppet/*
 %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster
 %config(noreplace) %{_sysconfdir}/puppet/fileserver.conf
+%config(noreplace) %{_sysconfdir}/puppet/puppetmasterd.conf
 %{_sbindir}/cf2puppet
 %{_sbindir}/puppetca
 
+%pre
+# Use uid 317 - we need to find out how to properly assign
+# uid's for system users
+/usr/sbin/useradd -c "Puppet" -u 317 \
+        -s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null || :
+
 %post
 touch %{_localstatedir}/log/puppet.log
 /sbin/chkconfig --add puppet
@@ -104,7 +122,13 @@ fi
 %{__rm} -rf %{buildroot}
 
 %changelog
-* Mon Feb  6 2006 David Lutterkort <dlutter@redhat.com> - 0.12.1-1
+* Wed Feb  8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-3
+- Fix puppetd.conf
+
+* Wed Feb  8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-2
+- Changes to run puppetmaster as user puppet
+
+* Mon Feb  6 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-1
 - Don't mark initscripts as config files
 
 * Mon Feb  6 2006 David Lutterkort <dlutter@redhat.com> - 0.12.0-2

data/conf/redhat/puppetd.conf

@@ -0,0 +1,5 @@
+[puppetd]
+# Make sure all log messages are sent to the right directory
+# This directory must be writable by the puppet user
+logdir=/var/log/puppet
+rundir=/var/run/puppet

data/conf/redhat/puppetmasterd.conf

@@ -0,0 +1,5 @@
+[puppetmasterd]
+# Make sure all log messages are sent to the right directory
+# This directory must be writable by the puppet user
+logdir=/var/log/puppet
+rundir=/var/run/puppet

data/conf/redhat/server.init

@@ -21,7 +21,7 @@ if [ -f /etc/sysconfig/puppetmaster ]; then
 fi
 
 [ -z "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_MANIFEST=/etc/puppet/manifests/site.pp
-[ -z "$PUPPETMASTER_LOG" ] && PUPPETMASTER_LOG="/var/log/puppetmaster.log"
+[ -z "$PUPPETMASTER_LOG" ] && PUPPETMASTER_LOG="/var/log/puppet/puppetmaster.log"
 PUPPETMASTER_OPTS="
 	--manifest=$PUPPETMASTER_MANIFEST \
 	--logdest=${PUPPETMASTER_LOG} \
@@ -33,7 +33,7 @@ prog=puppetmasterd
 PUPPETMASTER=/usr/sbin/$prog
 
 start() {
-	echo -n $"Starting $prog: "
+	echo -n $"Starting puppetmaster: "
 
 	# Confirm the manifest exists
 	if [ -r $PUPPETMASTER_MANIFEST ]; then
@@ -52,7 +52,7 @@ start() {
 }
 
 stop() {
-	echo -n  $"Stopping $prog: "
+	echo -n  $"Stopping puppetmaster: "
 	killproc $PUPPETMASTER
 	RETVAL=$?
 	echo

data/examples/code/snippets/aliastest.pp

@@ -0,0 +1,16 @@
+file { "a file":
+    path => "/tmp/aliastest",
+    ensure => file
+}
+
+file { "another":
+    path => "/tmp/aliastest2",
+    ensure => file,
+    require => file["a file"]
+}
+
+file { "a third":
+    path => "/tmp/aliastest3",
+    ensure => file,
+    require => file["/tmp/aliastest"]
+}

data/ext/module_puppet

@@ -83,9 +83,7 @@ master = {
     :Local => true
 }
 
-# We default to a non-console log destination, because we assume this is being
-# run non-interactively.
-#Puppet[:logdest] = :console
+setdest = false
 
 begin
     result.each { |opt,arg|
@@ -103,12 +101,17 @@ begin
             when "--use-nodes"
                 master[:UseNodes] = true
             when "--verbose"
+                Puppet::Log.level = :info
+                Puppet::Log.newdestination(:console)
                 verbose = true
             when "--debug"
+                Puppet::Log.level = :debug
+                Puppet::Log.newdestination(:console)
                 debug = true
             when "--logdest"
                 begin
                     Puppet::Log.newdestination arg
+                    setdest=true
                 rescue => detail
                     $stderr.puts detail.to_s
                 end
@@ -124,14 +127,6 @@ rescue GetoptLong::InvalidOption => detail
     exit(1)
 end
 
-if debug
-    Puppet::Log.level = :debug
-    Puppet::Log.newdestination :console
-elsif verbose
-    Puppet::Log.level = :info
-    Puppet::Log.newdestination :console
-end
-
 # Now parse the config
 if Puppet[:config] and File.exists? Puppet[:config]
     Puppet.config.parse(Puppet[:config])
@@ -145,6 +140,10 @@ unless ARGV.length > 0
     exit(14)
 end
 
+unless setdest
+    Puppet::Log.newdestination(:syslog)
+end
+
 master[:File] = ARGV.shift
 
 unless ENV.include?("CFALLCLASSES")

data/lib/puppet.rb

@@ -14,7 +14,7 @@ require 'puppet/util'
 #
 # it's also a place to find top-level commands like 'debug'
 module Puppet
-    PUPPETVERSION = '0.13.0'
+    PUPPETVERSION = '0.13.1'
 
     def Puppet.version
         return PUPPETVERSION
@@ -122,10 +122,11 @@ module Puppet
             directory can be removed without causing harm (although it might
             result in spurious service restarts)."],
         [:rundir,          "$vardir/run", "Where Puppet PID files are kept."],
+        [:lockdir,         "$vardir/locks", "Where lock files are kept."],
         [:statefile,       "$statedir/state.yaml",
-            "Where puppetd and puppetmasterd store state associated with the running
-            configuration.  In the case of puppetmasterd, this file reflects the
-            state discovered through interacting with clients."],
+            "Where puppetd and puppetmasterd store state associated with the
+            running configuration.  In the case of puppetmasterd, this file
+            reflects the state discovered through interacting with clients."],
         [:ssldir,          "$confdir/ssl", "Where SSL certificates are kept."],
         [:genconfig,        false,
             "Whether to just print a configuration to stdout and exit.  Only makes

data/lib/puppet/client.rb

@@ -11,9 +11,9 @@ module Puppet
         include Puppet
         include SignalObserver
 
-        # FIXME the cert stuff should only come up with networking, so it
-        # should be in the network client, not the normal client
-        # but if i do that, it's hard to tell whether the certs have been initialized
+        # FIXME The cert stuff should only come up with networking, so it
+        # should be in the network client, not the normal client.  But if i do
+        # that, it's hard to tell whether the certs have been initialized.
         include Puppet::Daemon
         attr_reader :local, :secureinit
         attr_accessor :schedule, :lastrun
@@ -151,4 +151,4 @@ module Puppet
     end
 end
 
-# $Id: client.rb 849 2006-01-24 06:37:00Z luke $
+# $Id: client.rb 897 2006-02-12 18:08:39Z luke $

data/lib/puppet/daemon.rb

@@ -221,7 +221,8 @@ module Puppet
                 begin
                     File.unlink(@pidfile)
                 rescue => detail
-                    Puppet.err "Could not remove PID file %s: %s" % [@pidfile, detail]
+                    Puppet.err "Could not remove PID file %s: %s" %
+                        [@pidfile, detail]
                 end
             end
 
@@ -233,4 +234,4 @@ module Puppet
     end
 end
 
-# $Id: daemon.rb 856 2006-01-30 16:18:24Z luke $
+# $Id: daemon.rb 897 2006-02-12 18:08:39Z luke $

data/lib/puppet/filetype.rb

@@ -44,6 +44,9 @@ module Puppet
                     rescue Puppet::Error => detail
                         raise
                     rescue => detail
+                        if Puppet[:debug]
+                            puts detail.backtrace
+                        end
                         raise Puppet::Error, "%s could not read %s: %s" %
                             [self.class, @path, detail]
                     end
@@ -134,29 +137,38 @@ module Puppet
             # Only add the -u flag when the @path is different.  Fedora apparently
             # does not think I should be allowed to set the @path to my
             def cmdbase
-                uid = CronType.uid(@path)
                 cmd = nil
-                if uid == Process.uid
+                if @path == Process.uid
                     return "crontab"
                 else
                     return "crontab -u #{@path}"
                 end
             end
 
+            def initialize(user)
+                begin
+                    uid = Puppet::Util.uid(user)
+                rescue Puppet::Error => detail
+                    raise Puppet::Error, "Could not retrieve user %s" % user
+                end
+
+                @path = uid
+            end
+
             # Read a specific @path's cron tab.
             def read
-                %x{#{cmdbase(@path)} -l 2>/dev/null}
+                %x{#{cmdbase()} -l 2>/dev/null}
             end
 
             # Remove a specific @path's cron tab.
             def remove
-                %x{#{cmdbase(@path)} -r 2>/dev/null}
+                %x{#{cmdbase()} -r 2>/dev/null}
             end
 
             # Overwrite a specific @path's cron tab; must be passed the @path name
             # and the text with which to create the cron tab.
             def write(text)
-                IO.popen("#{cmdbase(@path)} -", "w") { |p|
+                IO.popen("#{cmdbase()} -", "w") { |p|
                     p.print text
                 }
             end
@@ -192,4 +204,4 @@ module Puppet
     end
 end
 
-# $Id: filetype.rb 848 2006-01-24 06:01:58Z luke $
+# $Id: filetype.rb 898 2006-02-13 17:13:09Z luke $

data/lib/puppet/lock.rb

@@ -0,0 +1,64 @@
+require 'thread'
+require 'sync'
+
+# Gotten from:
+# http://path.berkeley.edu/~vjoel/ruby/solaris-bug.rb
+
+# Extensions to the File class for exception-safe file locking in a
+# environment with multiple user threads.
+
+# This is here because closing a file on solaris unlocks any locks that
+# other threads might have. So we have to make sure that only the last
+# reader thread closes the file.
+#
+# The hash maps inode number to a count of reader threads
+$reader_count = Hash.new(0)
+
+class File
+    # Get an exclusive (i.e., write) lock on the file, and yield to the block.
+    # If the lock is not available, wait for it without blocking other ruby
+    # threads.
+    def lock_exclusive
+        if Thread.list.size == 1
+            flock(LOCK_EX)
+        else
+            # ugly hack because waiting for a lock in a Ruby thread blocks the
+            # process
+            period = 0.001
+            until flock(LOCK_EX|LOCK_NB)
+                sleep period
+                period *= 2 if period < 1
+            end
+        end
+
+        yield self
+    ensure
+        flush
+        flock(LOCK_UN)
+    end
+  
+    # Get a shared (i.e., read) lock on the file, and yield to the block.
+    # If the lock is not available, wait for it without blocking other ruby
+    # threads.
+    def lock_shared
+        if Thread.list.size == 1
+            flock(LOCK_SH)
+        else
+            # ugly hack because waiting for a lock in a Ruby thread blocks the
+            # process
+            period = 0.001
+            until flock(LOCK_SH|LOCK_NB)
+                sleep period
+                period *= 2 if period < 1
+            end
+        end
+
+        yield self
+    ensure
+        Thread.exclusive {flock(LOCK_UN) if $reader_count[self.stat.ino] == 1}
+        ## for solaris, no need to unlock here--closing does it
+        ## but this has no effect on the bug
+    end
+end
+
+# $Id: lock.rb 897 2006-02-12 18:08:39Z luke $