puppet 3.0.0 → 3.0.1.rc1

data/Rakefile

@@ -20,37 +20,42 @@ end
 require 'rake'
 require 'rspec'
 require "rspec/core/rake_task"
-require 'yaml'
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 Dir['ext/packaging/tasks/**/*'].sort.each { |t| load t }
 
-begin
-  @build_defaults ||= YAML.load_file('ext/build_defaults.yaml')
+build_defs_file = 'ext/build_defaults.yaml'
+if File.exist?(build_defs_file)
+  begin
+    require 'yaml'
+    @build_defaults ||= YAML.load_file(build_defs_file)
+  rescue Exception => e
+    STDERR.puts "Unable to load yaml from #{build_defs_file}:"
+    STDERR.puts e
+  end
   @packaging_url  = @build_defaults['packaging_url']
   @packaging_repo = @build_defaults['packaging_repo']
-rescue
-  STDERR.puts 'Unable to read the packaging repo info from ext/build_defaults.yaml'
-end
+  raise "Could not find packaging url in #{build_defs_file}" if @packaging_url.nil?
+  raise "Could not find packaging repo in #{build_defs_file}" if @packaging_repo.nil?
 
-namespace :package do
-  desc "Bootstrap packaging automation, e.g. clone into packaging repo"
-  task :bootstrap do
-    if File.exist?("ext/#{@packaging_repo}")
-      puts "It looks like you already have ext/#{@packaging_repo}. If you don't like it, blow it away with package:implode."
-    else
-      cd 'ext' do
-        %x{git clone #{@packaging_url}}
+  namespace :package do
+    desc "Bootstrap packaging automation, e.g. clone into packaging repo"
+    task :bootstrap do
+      if File.exist?("ext/#{@packaging_repo}")
+        puts "It looks like you already have ext/#{@packaging_repo}. If you don't like it, blow it away with package:implode."
+      else
+        cd 'ext' do
+          %x{git clone #{@packaging_url}}
+        end
       end
     end
-  end
-  desc "Remove all cloned packaging automation"
-  task :implode do
-    rm_rf "ext/#{@packaging_repo}"
+    desc "Remove all cloned packaging automation"
+    task :implode do
+      rm_rf "ext/#{@packaging_repo}"
+    end
   end
 end
 
-
 task :default do
     sh %{rake -T}
 end

data/bin/puppet

@@ -1,10 +1,4 @@
 #!/usr/bin/env ruby
 
-# Load rubygems so we can require gems
-begin
-  require 'rubygems'
-rescue LoadError
-end
-
 require 'puppet/util/command_line'
 Puppet::Util::CommandLine.new.execute

data/examples/modules/{sample-module.pp → sample_module.pp}

@@ -7,4 +7,4 @@
 # sample-module demonstrates the use of a custom language function
 # included within the module bundle.
 
-include sample-module
+include sample_module

data/examples/modules/{sample-module → sample_module}/manifests/init.pp

@@ -3,7 +3,7 @@
 # Demonstration of a custom parser function and erb template within
 # a module, working in concert.
 
-class sample-module {
+class sample_module {
   $fqdn_to_dn = hostname_to_dn($domain)
   $sample_template = template("sample-module/sample.erb")
 

data/ext/debian/puppetmaster.README.debian

@@ -5,8 +5,7 @@ to fall over when you get close to 30 nodes. You will start to see
 connection-reset or End-of-file errors when this happens.
 
 You will want to a server that can scale better than webrick, such as
-Passenger (aka. mod_rails), or mongrel, both with a front-end
-web-proxy such as apache.
+Passenger (aka. mod_rails), with a front-end web-proxy such as apache.
 
 If you would like to run Passenger (aka. mod_rails) with apache install the
 puppetmaster-passenger package. It will automatically setup an apache2 virtual

data/ext/debian/puppetmaster.default

@@ -7,32 +7,5 @@ START=yes
 # Startup options
 DAEMON_OPTS=""
 
-# What server type to run 
-# Options: 
-# 	   webrick: default, cannot handle more than ~30 nodes
-#	   mongrel: scales better than webrick because you can run
-#	    	    multiple processes if you are getting
-#	    	    connection-reset or End-of-file errors, switch to
-#	    	    mongrel. Requires front-end web-proxy such as
-#	    	    apache, nginx, or pound, more information:
-#	            http://puppetlabs.com/trac/puppet/wiki/UsingMongrel
-#          passenger: no need to set this, be sure to set START=no above
-SERVERTYPE=webrick
-
-# How many puppetmaster instances to start? Its pointless to set this
-# higher than 1 if you are not using mongrel. 
-PUPPETMASTERS=1
-
-# What port should the puppetmaster listen on (default: 8140). If
-# PUPPETMASTERS is set to a number greater than 1, then the port for
-# the first puppetmaster will be set to the port listed below, and
-# further instances will be incremented by one 
-#
-# NOTE: if you are using mongrel, then you will need to have a
-# front-end web-proxy (such as apache, nginx, pound) that takes
-# incoming requests on the port your clients are connecting to
-# (default is: 8140), and then passes them off to the mongrel
-# processes.  In this case it is recommended to run your web-proxy on
-# port 8140 and change the below number to something else, such as
-# 18140.
+# What port should the puppetmaster listen on (default: 8140).
 PORT=8140

data/ext/debian/puppetmaster.init

@@ -5,7 +5,7 @@
 # Required-Stop:     $network $named $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-### END INIT INFO                 
+### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/puppet
@@ -20,11 +20,25 @@ test -x $DAEMON || exit 0
 . /lib/lsb/init-functions
 
 if [ ! -d /var/run/puppet ]; then
-	mkdir -p /var/run/puppet
+    mkdir -p /var/run/puppet
 fi
 
 chown puppet:puppet /var/run/puppet
 
+mongrel_warning="The mongrel servertype is no longer built-in to Puppet. It
+appears as though mongrel is being used, as the number of puppetmasters is
+greater than one. Starting the puppetmaster service will not behave as expected
+until this is resolved. Only the first port has been used in the service, and
+only one puppetmaster has been started. These settings are defined in
+/etc/default/puppetmaster"
+
+
+# Warn about removed and unsupported mongrel servertype
+if ([ -n "$PUPPETMASTERS" ] && [ ${PUPPETMASTERS} -gt 1 ]) || [ "${SERVERTYPE}" = "mongrel" ]; then
+    echo $mongrel_warning
+    echo
+fi
+
 is_true() {
     if [ "x$1" = "xtrue" -o "x$1" = "xyes" -o "x$1" = "x0" ] ; then
         return 0
@@ -35,41 +49,16 @@ is_true() {
 
 start_puppet_master() {
     if is_true "$START" ; then
-	if [ "$SERVERTYPE" = "mongrel" ]
-	then
-	    DAEMON_OPTS="$DAEMON_OPTS --servertype=mongrel"
-	    NUMSTART=0
-	    STARTPORT=$PORT
-	    while [ $NUMSTART -lt $PUPPETMASTERS ]; do 
-		start-stop-daemon --start --quiet --pidfile=/var/run/puppet/${NAME}-${STARTPORT}.pid \
-		    --startas $DAEMON -- $NAME $DAEMON_OPTS --masterport=$STARTPORT --pidfile=/var/run/puppet/${NAME}-${STARTPORT}.pid
-		STARTPORT=$(($STARTPORT + 1))
-		NUMSTART=$(($NUMSTART + 1))
-	    done
-	else
-	    start-stop-daemon --start --quiet --pidfile /var/run/puppet/${NAME}.pid \
-		--startas $DAEMON -- $NAME $DAEMON_OPTS --masterport=$PORT
-	fi
+        start-stop-daemon --start --quiet --pidfile /var/run/puppet/${NAME}.pid \
+            --startas $DAEMON -- $NAME $DAEMON_OPTS --masterport=$PORT
     else
-	echo ""
-	echo "puppetmaster not configured to start, please edit /etc/default/puppetmaster to enable"
+        echo ""
+        echo "puppetmaster not configured to start, please edit /etc/default/puppetmaster to enable"
     fi
 }
 
 stop_puppet_master() {
-    if [ "$SERVERTYPE" = "mongrel" ]
-    then
-	NUMSTART=0
-	STOPPORT=$PORT
-	while [ $NUMSTART -lt $PUPPETMASTERS ]; do 
-	    start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/puppet/${NAME}-${STOPPORT}.pid
-	    rm -f /var/run/puppet/${NAME}-${STOPPORT}.pid
-	    STOPPORT=$(($STOPPORT + 1))
-	    NUMSTART=$(($NUMSTART + 1))
-	done
-    else
-	start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/puppet/${NAME}.pid
-    fi
+    start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/puppet/${NAME}.pid
 }
 
 status_puppet_master() {
@@ -84,13 +73,13 @@ status_puppet_master() {
                 esac
             done
             shift $(($OPTIND - 1))
-            
+
             if [ -n "$pidfile" ]; then
                 pidfile="-p $pidfile"
             fi
             daemon="$1"
             name="$2"
-        
+
             status="0"
             pidofproc $pidfile $daemon >/dev/null || status="$?"
             if [ "$status" = 0 ]; then
@@ -102,57 +91,47 @@ status_puppet_master() {
             else
                 log_failure_msg "$name is not running"
                 return $status
-            fi         
+            fi
         }
     fi
 
-   if is_true "$START" ; then
-	if [ "$SERVERTYPE" = "mongrel" ]
-	then
-	    NUMSTART=0
-	    STARTPORT=$PORT
-	    while [ $NUMSTART -lt $PUPPETMASTERS ]; do 
-		status_of_proc -p "/var/run/puppet/${NAME}-${STARTPORT}.pid" \
-                    "${DAEMON}" "${NAME}-${STARTPORT}"
-		STARTPORT=$(($STARTPORT + 1))
-		NUMSTART=$(($NUMSTART + 1))
-	    done
-	else
-            status_of_proc -p "/var/run/puppet/${NAME}.pid" "${DAEMON}" "${NAME}"
-	fi
+    if is_true "$START" ; then
+        status_of_proc -p "/var/run/puppet/${NAME}.pid" "${DAEMON}" "${NAME}"
     else
-	echo ""
-	echo "puppetmaster not configured to start"
+        echo ""
+        echo "puppetmaster not configured to start"
     fi
 }
 
 
 case "$1" in
     start)
-	log_begin_msg "Starting $DESC"
-	start_puppet_master
-	log_end_msg $?
-	;;
+        log_begin_msg "Starting $DESC"
+        start_puppet_master
+        log_end_msg $?
+        ;;
     stop)
-	log_begin_msg "Stopping $DESC"
-	stop_puppet_master
-	log_end_msg $?
-	;;
+        log_begin_msg "Stopping $DESC"
+        stop_puppet_master
+        log_end_msg $?
+        ;;
     reload)
-  	# Do nothing, as Puppetmaster rechecks its config automatically
+        # Do nothing, as Puppetmaster rechecks its config automatically
         ;;
     status)
-	status_puppet_master
+        status_puppet_master
         ;;
     restart|force-reload)
-	log_begin_msg "Restarting $DESC"
-	stop_puppet_master
-	sleep 1
-	start_puppet_master
-	log_end_msg $?
-	;;
+        log_begin_msg "Restarting $DESC"
+        stop_puppet_master
+        sleep 1
+        start_puppet_master
+        log_end_msg $?
+        ;;
     *)
-	echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2
-	exit 1
-	;;
+        echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2
+        exit 1
+        ;;
 esac
+
+# vim: tabstop=4:softtabstop=4:shiftwidth=4:expandtab

data/ext/project_data.yaml

@@ -15,8 +15,8 @@ gem_executables: 'puppet'
 gem_default_executables: 'puppet'
 gem_forge_project: 'puppet'
 gem_runtime_dependencies:
-  facter: '>= 1.6.11'
-  hiera: '>= 1.0.0rc'
+  facter: '~> 1.6.11'
+  hiera: '~> 1.0.0'
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"

data/ext/rack/README

@@ -21,21 +21,6 @@ WEBrick is currently not supported as a Rack host. You'll be better off
 just running puppetmasterd directly.
 
 
-Mongrel
--------
-
-If you like Mongrel, and want to replicate wiki:UsingMongrel, you could
-probably start your backend mongrels this way:
-
-cd ext/rack
-for port in `seq 18140 18150`; do
-  rackup --server mongrel --port $port &
-done
-
-rackup is part of the rack gem. Make sure it's in your path.
-
-
-
 Apache with Passenger (aka mod_rails)
 -------------------------------------
 

data/ext/rack/files/config.ru

@@ -11,9 +11,11 @@ $0 = "master"
 
 ARGV << "--rack"
 
-# Rack applications typically don't start as root.  Set --confdir to prevent
-# reading configuration from ~/.puppet/puppet.conf
+# Rack applications typically don't start as root.  Set --confdir and --vardir
+# to prevent reading configuration from ~puppet/.puppet/puppet.conf and writing
+# to ~puppet/.puppet
 ARGV << "--confdir" << "/etc/puppet"
+ARGV << "--vardir"  << "/var/lib/puppet"
 
 # NOTE: it's unfortunate that we have to use the "CommandLine" class
 #  here to launch the app, but it contains some initialization logic

data/ext/redhat/logrotate

@@ -4,7 +4,7 @@
   create 0644 puppet puppet
   sharedscripts
   postrotate
-    pkill -USR2 -u puppet -f /usr/sbin/puppetmasterd || true
+    pkill -USR2 -u puppet -f 'puppet master' || true
     [ -e /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1 || true
   endscript
 }

data/ext/redhat/server.init

@@ -24,11 +24,7 @@ fi
 
 PUPPETMASTER_OPTS="master "
 [ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --manifest=${PUPPETMASTER_MANIFEST}"
-if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
-    PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --servertype=mongrel"
-elif [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then
-    PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"
-fi
+[ -n "$PUPPETMASTER_PORTS" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"
 [ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest ${PUPPETMASTER_LOG}"
 PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
     ${PUPPETMASTER_EXTRA_OPTS}"
@@ -40,9 +36,20 @@ if status | grep -q -- '-p' 2>/dev/null; then
     pidopts="-p $pidfile"
 fi
 
+mongrel_warning="The mongrel servertype is no longer built-in to Puppet. It appears
+as though mongrel is being used, as the number of ports is greater than
+one. Starting the puppetmaster service will not behave as expected until this
+is resolved. Only the first port has been used in the service. These settings
+are defined at /etc/sysconfig/puppetmaster"
+
+# Warn about removed and unsupported mongrel servertype
+if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
+    echo $mongrel_warning
+    echo
+fi
+
 RETVAL=0
 
-prog=puppetmasterd
 PUPPETMASTER=/usr/bin/puppet
 
 start() {
@@ -50,16 +57,8 @@ start() {
 
     # Confirm the manifest exists
     if [ -r $PUPPETMASTER_MANIFEST ]; then
-        if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
-            for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
-                echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}"
-                daemon $PUPPETMASTER $PUPPETMASTER_OPTS --masterport=${PUPPETMASTER_PORTS[$i]} --pidfile=/var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid
-                ret=$?; [ $ret != 0 ] && RETVAL=$ret
-            done
-        else
-            daemon $daemonopts $PUPPETMASTER $PUPPETMASTER_OPTS
-            RETVAL=$?
-        fi
+        daemon $daemonopts $PUPPETMASTER $PUPPETMASTER_OPTS
+        RETVAL=$?
     else
         failure $"Manifest does not exist: $PUPPETMASTER_MANIFEST"
         echo
@@ -72,72 +71,58 @@ start() {
 
 stop() {
     echo -n  $"Stopping puppetmaster: "
-    if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
-        for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
-            echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}"
-            killproc -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster
-            ret=$?; [ $ret != 0 ] && RETVAL=$ret
-        done
-    else
-        killproc $pidopts $PUPPETMASTER
-        RETVAL=$?
-    fi
+    killproc $pidopts $PUPPETMASTER
+    RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && rm -f "$lockfile"
     return $RETVAL
 }
 
 restart() {
-  stop
-  start
+    stop
+    start
 }
 
 genconfig() {
-  echo -n $"Generate configuration puppetmaster: "
-  $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig
+    echo -n $"Generate configuration puppetmaster: "
+    $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig
 }
 
 rh_status() {
-    if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
-        for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
-            echo -en "Port ${PUPPETMASTER_PORTS[$i]}: "
-            status -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster
-            ret=$?; [ $ret != 0 ] && RETVAL=$ret
-        done
-    else
-        status $pidopts $PUPPETMASTER
-        RETVAL=$?
-    fi
+    status $pidopts $PUPPETMASTER
+    RETVAL=$?
     return $RETVAL
 }
 
 rh_status_q() {
-        rh_status >/dev/null 2>&1
+    rh_status >/dev/null 2>&1
 }
 
 case "$1" in
-  start)
-      start
-    ;;
+    start)
+        start
+        ;;
     stop)
         stop
-    ;;
+        ;;
     restart|reload|force-reload)
         restart
-    ;;
+        ;;
     condrestart)
         rh_status_q || exit 0
         restart
-    ;;
+        ;;
     status)
         rh_status
-    ;;
+        ;;
     genconfig)
         genconfig
-    ;;
+        ;;
     *)
         echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}"
         exit 1
 esac
 
 exit $RETVAL
+
+# vim: tabstop=4:softtabstop=4:shiftwidth=4:expandtab