Removed extra whitespace from end of lines

9 files changed, 50 insertions, 50 deletions

diff --git a/conf/auth.conf b/conf/auth.conf
index 60d99f272..431e4b205 100644
--- a/conf/auth.conf
+++ b/conf/auth.conf
@@ -1,11 +1,11 @@
 # This is an example auth.conf file, it mimics the puppetmasterd defaults
-# 
+#
 # The ACL are checked in order of appearance in this file.
-# 
+#
 # Supported syntax:
-# This file supports two different syntax depending on how 
+# This file supports two different syntax depending on how
 # you want to express the ACL.
-# 
+#
 # Path syntax (the one used below):
 # ---------------------------------
 # path /path/to/resource
@@ -14,35 +14,35 @@
 # [auth[enthicated] {yes|no|on|off|any}]
 # allow [host|ip|*]
 # deny [host|ip]
-# 
+#
 # The path is matched as a prefix. That is /file match at
 # the same time /file_metadat and /file_content.
-# 
+#
 # Regex syntax:
 # -------------
 # This one is differenciated from the path one by a '~'
-# 
+#
 # path ~ regex
 # [environment envlist]
 # [method methodlist]
 # [auth[enthicated] {yes|no|on|off|any}]
 # allow [host|ip|*]
 # deny [host|ip]
-# 
+#
 # The regex syntax is the same as ruby ones.
-# 
+#
 # Ex:
 # path ~ .pp$
 # will match every resource ending in .pp (manifests files for instance)
-# 
+#
 # path ~ ^/path/to/resource
 # is essentially equivalent to path /path/to/resource
-# 
+#
 # environment:: restrict an ACL to a specific set of environments
 # method:: restrict an ACL to a specific set of methods
 # auth:: restrict an ACL to an authenticated or unauthenticated request
 # the default when unspecified is to restrict the ACL to authenticated requests
-# (ie exactly as if auth yes was present). 
+# (ie exactly as if auth yes was present).
 #
 
 ### Authenticated ACL - those applies only when the client
diff --git a/conf/osx/createpackage.sh b/conf/osx/createpackage.sh
index 32cbebfc5..75b5bb012 100755
--- a/conf/osx/createpackage.sh
+++ b/conf/osx/createpackage.sh
@@ -7,13 +7,13 @@
 # Last Updated: 2008-07-31
 #
 # Copyright 2008 Google Inc.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@ PREFLIGHT="preflight"
 
 
 function find_installer() {
-  # we walk up three directories to make this executable from the root, 
+  # we walk up three directories to make this executable from the root,
   # root/conf or root/conf/osx
   if [ -f "./${INSTALLRB}" ]; then
     installer="$(pwd)/${INSTALLRB}"
@@ -63,7 +63,7 @@ function prepare_package() {
   # to look at for package creation and substitue the version strings out.
   # Major/Minor versions can only be integers, so we have "0" and "245" for
   # puppet version 0.24.5
-  # Note too that for 10.5 compatibility this Info.plist *must* be set to 
+  # Note too that for 10.5 compatibility this Info.plist *must* be set to
   # follow symlinks.
   VER1=$(echo ${puppet_version} | awk -F "." '{print $1}')
   VER2=$(echo ${puppet_version} | awk -F "." '{print $2}')
@@ -74,12 +74,12 @@ function prepare_package() {
   sed -i '' "s/{SHORTVERSION}/${puppet_version}/g" "${pkgtemp}/${PROTO_PLIST}"
   sed -i '' "s/{MAJORVERSION}/${major_version}/g" "${pkgtemp}/${PROTO_PLIST}"
   sed -i '' "s/{MINORVERSION}/${minor_version}/g" "${pkgtemp}/${PROTO_PLIST}"
-  
+
   # We need to create a preflight script to remove traces of previous
   # puppet installs due to limitations in Apple's pkg format.
   mkdir "${pkgtemp}/scripts"
   cp "${puppet_root}/conf/osx/${PREFLIGHT}" "${pkgtemp}/scripts"
-  
+
   # substitute in the sitelibdir specified above on the assumption that this
   # is where any previous puppet install exists that should be cleaned out.
   sed -i '' "s|{SITELIBDIR}|${SITELIBDIR}|g" "${pkgtemp}/scripts/${PREFLIGHT}"
@@ -123,44 +123,44 @@ function main() {
   fi
 
   find_installer
-  
+
   if [ ! "${installer}" ]; then
     echo "Unable to find ${INSTALLRB}"
     cleanup_and_exit 1
   fi
 
   find_puppet_root
-  
+
   if [ ! "${puppet_root}" ]; then
     echo "Unable to find puppet repository root."
     cleanup_and_exit 1
   fi
-  
+
   pkgroot=$(mktemp -d -t puppetpkg)
-  
+
   if [ ! "${pkgroot}" ]; then
     echo "Unable to create temporary package root."
     cleanup_and_exit 1
   fi
-  
+
   pkgtemp=$(mktemp -d -t puppettmp)
-  
+
   if [ ! "${pkgtemp}" ]; then
     echo "Unable to create temporary package root."
     cleanup_and_exit 1
   fi
-  
+
   install_puppet
   get_puppet_version
-  
+
   if [ ! "${puppet_version}" ]; then
     echo "Unable to retrieve puppet version"
     cleanup_and_exit 1
   fi
-  
+
   prepare_package
   create_package
-  
+
   cleanup_and_exit 0
 }
 
diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 48c8e4ed5..34e0c3fc7 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -26,7 +26,7 @@ PUPPETMASTER_OPTS=""
 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]}" 
+    PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"
 fi
 [ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest=${PUPPETMASTER_LOG}"
 PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
@@ -67,7 +67,7 @@ stop() {
     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 
+            killproc -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster
             ret=$?; [ $ret != 0 ] && RETVAL=$ret
         done
     else
@@ -93,9 +93,9 @@ puppetmaster_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 
+            status -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster
             ret=$?; [ $ret != 0 ] && RETVAL=$ret
-        done 
+        done
     else
         status $PUPPETMASTER
         RETVAL=$?
diff --git a/conf/redhat/server.sysconfig b/conf/redhat/server.sysconfig
index befb40fee..1e3997b61 100644
--- a/conf/redhat/server.sysconfig
+++ b/conf/redhat/server.sysconfig
@@ -5,20 +5,20 @@
 # Specify syslog to send log messages to the system log.
 #PUPPETMASTER_LOG=syslog
 
-# You may specify an alternate port or an array of ports on which 
+# You may specify an alternate port or an array of ports on which
 # puppetmaster should listen. Default is: 8140
 # If you specify more than one port, the puppetmaster ist automatically
 # started with the servertype set to mongrel. This might be interesting
 # if you'd like to run your puppetmaster in a loadbalanced cluster.
-# Please note: this won't setup nor start any loadbalancer. 
+# Please note: this won't setup nor start any loadbalancer.
 # If you'd like to run puppetmaster with mongrel as servertype but only
 # on one (specified) port, you have to add --servertype=mongrel to
 # PUPPETMASTER_EXTRA_OPTS.
-# Default: Empty (Puppetmaster isn't started with mongrel, nor on a 
+# Default: Empty (Puppetmaster isn't started with mongrel, nor on a
 # specific port)
 #
 # Please note: Due to reduced options in the rc-functions lib in RHEL/Centos
-# versions prior to 5, this feature won't work. Fedora versions >= 8 are 
+# versions prior to 5, this feature won't work. Fedora versions >= 8 are
 # known to work.
 #PUPPETMASTER_PORTS=""
 # Puppetmaster on a different port, run with standard webrick servertype
diff --git a/conf/solaris/smf/puppetd.xml b/conf/solaris/smf/puppetd.xml
index 4b62bac6d..84ee0087d 100644
--- a/conf/solaris/smf/puppetd.xml
+++ b/conf/solaris/smf/puppetd.xml
@@ -20,7 +20,7 @@
                 type='path'>
         <service_fmri value='file:///etc/puppet/puppet.conf'/>
     </dependency>
-        
+
     <dependency name='loopback'
                 grouping='require_all'
                 restart_on='error'
diff --git a/conf/solaris/smf/puppetmasterd.xml b/conf/solaris/smf/puppetmasterd.xml
index b7190eff0..e7b0113bd 100644
--- a/conf/solaris/smf/puppetmasterd.xml
+++ b/conf/solaris/smf/puppetmasterd.xml
@@ -20,7 +20,7 @@
                 type='path'>
         <service_fmri value='file:///etc/puppet/puppet.conf'/>
     </dependency>
-        
+
     <dependency name='loopback'
                 grouping='require_all'
                 restart_on='error'
diff --git a/conf/suse/client.init b/conf/suse/client.init
index d168e8cb4..b81869b55 100644
--- a/conf/suse/client.init
+++ b/conf/suse/client.init
@@ -14,7 +14,7 @@
 ### BEGIN INIT INFO
 # Provides: puppet
 # Required-Start: $local_fs $network $syslog
-# Should-Start: 
+# Should-Start:
 # Required-Stop:
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6
diff --git a/conf/suse/puppet.spec b/conf/suse/puppet.spec
index b7f7d6162..9d317f849 100644
--- a/conf/suse/puppet.spec
+++ b/conf/suse/puppet.spec
@@ -22,9 +22,9 @@ BuildArchitectures: noarch
 BuildRequires: ruby >= 1.8.6
 
 %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, 
+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
@@ -132,13 +132,13 @@ fi
 * Sat Feb 16 2008 James Turnbull <james@lovedthanlost.net> - 0.24.1-1
 - Fixed puppet configuation file references to match single puppet.conf file
 - Update versions for 0.24.1 release
- 
+
 * Tue Aug  3 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-3
 - Replaced puppet-bin.patch with %build section from David's spec
 
 * Tue Aug  1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-2
 - Added supprot for enabling services in SuSE
- 
+
 * Tue Aug  1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-1
 - New version and support for SuSE
 
@@ -150,7 +150,7 @@ fi
 
 * Mon Jun 19 2006 David Lutterkort <dlutter@redhat.com> - 0.18.0-1
 - Patch config for LSB compliance (lsb-config.patch)
-- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl 
+- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl
   to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt,
   /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml
 
@@ -173,7 +173,7 @@ fi
 - Rebuilt for new version
 
 * Wed Mar 22 2006 David Lutterkort <dlutter@redhat.com> - 0.15.1-1
-- Patch0: Run puppetmaster as root; running as puppet is not ready 
+- Patch0: Run puppetmaster as root; running as puppet is not ready
   for primetime
 
 * Mon Mar 13 2006 David Lutterkort <dlutter@redhat.com> - 0.15.0-1
@@ -188,7 +188,7 @@ fi
   allocate the puppet uid/gid dynamically
 
 * Sun Feb 19 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-4
-- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed 
+- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed
 problem with listing fileserver.conf and puppetmaster.conf twice
 
 * Wed Feb  8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-3
@@ -213,7 +213,7 @@ problem with listing fileserver.conf and puppetmaster.conf twice
 - 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 
+- 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>
diff --git a/conf/suse/server.init b/conf/suse/server.init
index 36a310784..2649af506 100644
--- a/conf/suse/server.init
+++ b/conf/suse/server.init
@@ -12,7 +12,7 @@
 ### BEGIN INIT INFO
 # Provides: puppetmaster
 # Required-Start: $local_fs $network $syslog
-# Should-Start: 
+# Should-Start:
 # Required-Stop:
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6