added puppet module to manage configgiles, removed unneeded patches for 0.24.1, moved config to manifests folder

4 files changed, 93 insertions, 0 deletions

diff --git a/files/client/puppet.conf b/files/client/puppet.conf
new file mode 100644
index 0000000..307692e
--- /dev/null
+++ b/files/client/puppet.conf
@@ -0,0 +1,22 @@
+[main]
+    logdir=/var/log/puppet
+    vardir=/var/lib/puppet
+    rundir=/var/run/puppet
+    
+    #ssldir=/var/lib/puppet/ssl
+    ssldir=/etc/puppet/ssl
+    
+    # Where 3rd party plugins and modules are installed
+    libdir = /var/lib/puppet/lib
+    
+    templatedir=/var/lib/puppet/templates
+
+    # Turn plug-in synchronization on.
+    pluginsync = true
+    pluginsource = puppet://$server/plugins
+    factpath = $vardir/lib/facter
+
+[puppetd]
+    report=true
+    server=puppet.glei.ch
+
diff --git a/files/improvements/functions/slash_escape.rb b/files/improvements/functions/slash_escape.rb
new file mode 100644
index 0000000..70cd892
--- /dev/null
+++ b/files/improvements/functions/slash_escape.rb
@@ -0,0 +1,6 @@
+# escape slashes in a String
+module Puppet::Parser::Functions
+        newfunction(:slash_escape, :type => :rvalue) do |args|
+		args[0].gsub(/\//, '\\/')
+	end
+end
diff --git a/files/master/fileserver.conf b/files/master/fileserver.conf
new file mode 100644
index 0000000..98f4ead
--- /dev/null
+++ b/files/master/fileserver.conf
@@ -0,0 +1,31 @@
+# This file consists of arbitrarily named sections/modules
+# defining where files are served from and to whom
+
+# Define a section 'files'
+# Adapt the allow/deny settings to your needs. Order
+# for allow/deny does not matter, allow always takes precedence
+# over deny
+#[files]
+#  path /var/lib/puppet/files
+#  allow *.example.com
+#  deny *.evil.example.com
+#  allow 192.168.0.0/24
+#
+[dist]
+  path /var/lib/puppet/dist
+  allow 127.0.0.1
+  allow *.euskal.internal
+  allow *.glei.ch
+
+[secfiles]
+  path /var/lib/puppet/secfiles
+  allow 127.0.0.1
+  allow *.euskal.internal
+  allow *.glei.ch
+
+[modules]
+  allow 127.0.0.1
+  allow *.glei.ch
+  allow *.euskal.internal
+#  path /var/lib/puppet/modules
+
diff --git a/files/master/puppet.conf b/files/master/puppet.conf
new file mode 100644
index 0000000..cdd4178
--- /dev/null
+++ b/files/master/puppet.conf
@@ -0,0 +1,34 @@
+[main]
+    logdir=/var/log/puppet
+    vardir=/var/lib/puppet
+    rundir=/var/run/puppet
+    
+    #ssldir=/var/lib/puppet/ssl
+    ssldir=/etc/puppet/ssl
+    
+    # Where 3rd party plugins and modules are installed
+    libdir = /var/lib/puppet/lib
+    
+    templatedir=/var/lib/puppet/templates
+
+    # Turn plug-in synchronization on.
+    pluginsync = true
+    pluginsource = puppet://$server/plugins
+    factpath = $vardir/lib/facter
+
+[puppetmasterd]
+    reportdir = $logdir/reports
+    storeconfigs=true
+    dbadapter=mysql
+    dbserver=localhost
+    dbuser=puppet
+    dbpassword=PcjS3d5pMdU,cR,v
+    dbsocket=/var/run/mysqld/mysqld.sock
+
+    #reports=log
+    modulepath=/var/lib/puppet/modules_src
+
+[puppetd]
+    report=true
+    server=puppet.glei.ch
+