apparently, puppet is not fond of sloppy line endings

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 1a839469124eb683eca6768b2c8a80e44dee3990..c2007060a9e0382bad7ea5884d6add4485e15280 100644 (file)
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -11,7 +11,7 @@ rundir=/var/run/puppet
 factpath=$vardir/facts
 pluginsync=true
 # This is the default environment for all clients
 factpath=$vardir/facts
 pluginsync=true
 # This is the default environment for all clients

-environment=production 
+environment=production

 
 [puppetmasterd]
 templatedir=/etc/puppet/templates
 
 [puppetmasterd]
 templatedir=/etc/puppet/templates

diff --git a/fileserver.conf b/fileserver.conf
index 88af72d705c92d7b04e9e81936bd580883b6dfab..2dc3000356fd092c22f5de13d53509d4ea8a29a4 100644 (file)
--- a/fileserver.conf
+++ b/fileserver.conf
@@ -11,7 +11,7 @@
 # for allow/deny does not matter, allow always takes precedence
 # over deny
 [files]
 # for allow/deny does not matter, allow always takes precedence
 # over deny
 [files]

-  path /etc/puppet/files 
+  path /etc/puppet/files

   allow *.debian.org
 #  deny *.evil.example.com
 #  allow 192.168.0.0/24
   allow *.debian.org
 #  deny *.evil.example.com
 #  allow 192.168.0.0/24


@@ -23,4 +23,4 @@
 #  allow 192.168.0.0/24
 [facts]
   allow *.debian.org
 #  allow 192.168.0.0/24
 [facts]
   allow *.debian.org

-  path /etc/puppet/facts 
+  path /etc/puppet/facts