Changed tabs to spaces without interfering with indentation or alignment

Author: Ian Taylor

README.queueing

@@ -56,7 +56,7 @@ tested with two of the most popular services - StompServer and ActiveMQ.
 
 + StompServer
 
-	http://rubyforge.org/projects/stompserver/
+    http://rubyforge.org/projects/stompserver/
 
 StompServer is a lightweight queueing service written in Ruby which is
 suitable for testing or low volume puppet usage. Works well when both
@@ -67,7 +67,7 @@ Just install the stompserver gem and run 'stompserver'.
 
 + Apache ActiveMQ
 
-	http://activemq.apache.org
+    http://activemq.apache.org
 
 Considered by many to be the most popular message service in use today,
 ActiveMQ has hundreds of features for scaling, persistence and so on.
@@ -76,7 +76,7 @@ Although installation is fairly simple, the configuration can seem quite
 intimidating, but for our use a one line change to the  standard configuration
 is all that is required and is explained at:
 
-	http://activemq.apache.org/stomp.html
+    http://activemq.apache.org/stomp.html
 
 Other customization of the internal workings of ActiveMQ, if any, will depend
 on your needs and deployment. A quick skimming of the ActiveMQ documentation

autotest/puppet_rspec.rb

@@ -16,30 +16,30 @@
 
     # force a complete re-run for all of these:
 
-	# main puppet lib
-	at.add_mapping(%r!^lib/puppet\.rb$!) { |filename, _|
+    # main puppet lib
+    at.add_mapping(%r!^lib/puppet\.rb$!) { |filename, _|
         at.files_matching %r!spec/(unit|integration)/.*\.rb!
-	}
+    }
 
-	# the spec_helper
-	at.add_mapping(%r!^spec/spec_helper\.rb$!) { |filename, _|
+    # the spec_helper
+    at.add_mapping(%r!^spec/spec_helper\.rb$!) { |filename, _|
         at.files_matching %r!spec/(unit|integration)/.*\.rb!
-	}
+    }
 
-	# the puppet test libraries
-	at.add_mapping(%r!^test/lib/puppettest/.*!) { |filename, _|
+    # the puppet test libraries
+    at.add_mapping(%r!^test/lib/puppettest/.*!) { |filename, _|
         at.files_matching %r!spec/(unit|integration)/.*\.rb!
-	}
+    }
 
         # the puppet spec libraries
-	at.add_mapping(%r!^spec/lib/spec.*!) { |filename, _|
+    at.add_mapping(%r!^spec/lib/spec.*!) { |filename, _|
         at.files_matching %r!spec/(unit|integration)/.*\.rb!
-	}
+    }
 
         # the monkey patches for rspec
-	at.add_mapping(%r!^spec/lib/monkey_patches/.*!) { |filename, _|
+    at.add_mapping(%r!^spec/lib/monkey_patches/.*!) { |filename, _|
         at.files_matching %r!spec/(unit|integration)/.*\.rb!
-	}
+    }
 end
 
 # a place for overrides when necessary.

conf/gentoo/init.d/puppetmaster

@@ -3,49 +3,49 @@
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
-	need net
-	before puppet
-	use dns logger
+    need net
+    before puppet
+    use dns logger
 }
 
 checkconfig() {
-	if [[ ! -d "${PUPPETMASTER_PID_DIR}" ]] ; then
-		eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory"
-		return 1
-	fi
+    if [[ ! -d "${PUPPETMASTER_PID_DIR}" ]] ; then
+        eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory"
+        return 1
+    fi
 
-	local site_manifest="/etc/puppet/manifests/site.pp"
-	[[ -n "${PUPPETMASTER_MANIFEST}" ]] && site_manifest="${PUPPETMASTER_MANIFEST}"
+    local site_manifest="/etc/puppet/manifests/site.pp"
+    [[ -n "${PUPPETMASTER_MANIFEST}" ]] && site_manifest="${PUPPETMASTER_MANIFEST}"
 
-	if [ ! -f "${site_manifest}" ] ; then
-		eerror "Please create ${site_manifest} before running puppet"
-		return 1
-	fi
+    if [ ! -f "${site_manifest}" ] ; then
+        eerror "Please create ${site_manifest} before running puppet"
+        return 1
+    fi
 
-	return 0
+    return 0
 }
 
 start() {
-	checkconfig || return $?
+    checkconfig || return $?
 
-	local options=""
-	[[ -n "${PUPPETMASTER_MANIFEST}" ]]   && options="${options} --manifest=${PUPPETMASTER_MANIFEST}"
-	[[ -n "${PUPPETMASTER_LOG}" ]]        && options="${options} --logdest=${PUPPETMASTER_LOG}"
-	[[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
+    local options=""
+    [[ -n "${PUPPETMASTER_MANIFEST}" ]]   && options="${options} --manifest=${PUPPETMASTER_MANIFEST}"
+    [[ -n "${PUPPETMASTER_LOG}" ]]        && options="${options} --logdest=${PUPPETMASTER_LOG}"
+    [[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
 
-	ebegin "Starting puppetmaster"
-	start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \
-		-- ${options}
-	eend $? "Failed to start puppetmaster"
+    ebegin "Starting puppetmaster"
+    start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \
+        -- ${options}
+    eend $? "Failed to start puppetmaster"
 }
 
 stop() {
-	ebegin "Stopping puppetmaster"
-	start-stop-daemon --stop --quiet \
-		--pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
-	local ret=$?
-	eend ${ret} "Failed to stop puppetmaster"
-	rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
-	return ${ret}
+    ebegin "Stopping puppetmaster"
+    start-stop-daemon --stop --quiet \
+        --pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+    local ret=$?
+    eend ${ret} "Failed to stop puppetmaster"
+    rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+    return ${ret}
 }
 

conf/osx/PackageInfo.plist

@@ -2,35 +2,35 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleIdentifier</key>
-	<string>com.reductivelabs.puppet</string>
-	<key>CFBundleShortVersionString</key>
-	<string>{SHORTVERSION}</string>
-	<key>IFMajorVersion</key>
-	<integer>{MAJORVERSION}</integer>
-	<key>IFMinorVersion</key>
-	<integer>{MINORVERSION}</integer>
-	<key>IFPkgFlagAllowBackRev</key>
-	<false/>
-	<key>IFPkgFlagAuthorizationAction</key>
-	<string>RootAuthorization</string>
-	<key>IFPkgFlagDefaultLocation</key>
-	<string>/</string>
-	<key>IFPkgFlagFollowLinks</key>
-	<true/>
-	<key>IFPkgFlagInstallFat</key>
-	<false/>
-	<key>IFPkgFlagIsRequired</key>
-	<false/>
-	<key>IFPkgFlagOverwritePermissions</key>
-	<false/>
-	<key>IFPkgFlagRelocatable</key>
-	<false/>
-	<key>IFPkgFlagRestartAction</key>
-	<string>None</string>
-	<key>IFPkgFlagRootVolumeOnly</key>
-	<true/>
-	<key>IFPkgFlagUpdateInstalledLanguages</key>
-	<false/>
+    <key>CFBundleIdentifier</key>
+    <string>com.reductivelabs.puppet</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{SHORTVERSION}</string>
+    <key>IFMajorVersion</key>
+    <integer>{MAJORVERSION}</integer>
+    <key>IFMinorVersion</key>
+    <integer>{MINORVERSION}</integer>
+    <key>IFPkgFlagAllowBackRev</key>
+    <false/>
+    <key>IFPkgFlagAuthorizationAction</key>
+    <string>RootAuthorization</string>
+    <key>IFPkgFlagDefaultLocation</key>
+    <string>/</string>
+    <key>IFPkgFlagFollowLinks</key>
+    <true/>
+    <key>IFPkgFlagInstallFat</key>
+    <false/>
+    <key>IFPkgFlagIsRequired</key>
+    <false/>
+    <key>IFPkgFlagOverwritePermissions</key>
+    <false/>
+    <key>IFPkgFlagRelocatable</key>
+    <false/>
+    <key>IFPkgFlagRestartAction</key>
+    <string>None</string>
+    <key>IFPkgFlagRootVolumeOnly</key>
+    <true/>
+    <key>IFPkgFlagUpdateInstalledLanguages</key>
+    <false/>
 </dict>
 </plist>

conf/redhat/client.init

@@ -33,28 +33,28 @@ PUPPET_OPTS=""
 ##[ -n "$INIT_VERSION" ] && PUPPET_OPTS="${PUPPET_OPTS} --fullrun"
 
 start() {
-	echo -n $"Starting puppet: "
-        daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
-	RETVAL=$?
-	echo
+    echo -n $"Starting puppet: "
+    daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
+    RETVAL=$?
+    echo
         [ $RETVAL = 0 ] && touch ${lockfile}
         return $RETVAL
 }
 
 stop() {
-	echo -n $"Stopping puppet: "
-        killproc $puppetd
-	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+    echo -n $"Stopping puppet: "
+    killproc $puppetd
+    RETVAL=$?
+    echo
+    [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
 }
 
 reload() {
-	echo -n $"Restarting puppet: "
-        killproc $puppetd -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
+    echo -n $"Restarting puppet: "
+    killproc $puppetd -HUP
+    RETVAL=$?
+    echo
+    return $RETVAL
 }
 
 restart() {
@@ -63,40 +63,40 @@ restart() {
 }
 
 genconfig() {
-  echo -n $"Generate configuration puppet: "
-  $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
+    echo -n $"Generate configuration puppet: "
+    $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
 }
 
 case "$1" in
-  start)
-	start
-	;;
-  stop) 
-	stop
-	;;
-  restart)
-	restart
-	;;
-  reload|force-reload)
+    start)
+        start
+    ;;
+    stop)
+        stop
+    ;;
+    restart)
+        restart
+    ;;
+    reload|force-reload)
         reload
-	;;
-  condrestart|try-restart)
-	[ -f "$pidfile" ] && restart
-	;;
-  status)
+    ;;
+    condrestart|try-restart)
+        [ -f "$pidfile" ] && restart
+    ;;
+    status)
         status -p "$pidfile" $puppetd
         RETVAL=$?
-	;;
-  once)
+    ;;
+    once)
         shift
         $puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
         ;;
-  genconfig)
-	genconfig
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
-	exit 1
+    genconfig)
+        genconfig
+    ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
+        exit 1
 esac
 
 exit $RETVAL