From d585fe589475c8d08cb643c8d85cb59ddcd6210b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Tue, 22 Sep 2009 20:33:37 +0300
Subject: [PATCH] Added files missing from previous commit.

---
 puppet/files/tagmail.conf                   |  1 +
 puppet/templates/puppetmaster.conf.erb      | 18 ++++++++++++
 puppet/templates/puppetmaster.sysconfig.erb | 31 +++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 puppet/files/tagmail.conf
 create mode 100644 puppet/templates/puppetmaster.conf.erb
 create mode 100644 puppet/templates/puppetmaster.sysconfig.erb

diff --git a/puppet/files/tagmail.conf b/puppet/files/tagmail.conf
new file mode 100644
index 0000000..cc708ad
--- /dev/null
+++ b/puppet/files/tagmail.conf
@@ -0,0 +1 @@
+all: root
diff --git a/puppet/templates/puppetmaster.conf.erb b/puppet/templates/puppetmaster.conf.erb
new file mode 100644
index 0000000..3370125
--- /dev/null
+++ b/puppet/templates/puppetmaster.conf.erb
@@ -0,0 +1,18 @@
+
+[puppetmasterd]
+    # Enable reporting on server.
+    reports = tagmail,store,rrdgraph
+
+    rrdgraph = true
+    rrddir = /srv/puppet/rrd
+
+    report = true
+    reportdir = /srv/puppet/reports
+
+    # Server bucket store.
+    bucketdir = /srv/puppet/bucket
+
+    # Use storeconfigs
+    storeconfigs = true
+    dbadapter = sqlite3
+    dblocation = /srv/puppet/storeconfigs/storeconfigs.db
diff --git a/puppet/templates/puppetmaster.sysconfig.erb b/puppet/templates/puppetmaster.sysconfig.erb
new file mode 100644
index 0000000..935b0c6
--- /dev/null
+++ b/puppet/templates/puppetmaster.sysconfig.erb
@@ -0,0 +1,31 @@
+# Location of the main manifest
+#PUPPETMASTER_MANIFEST=/etc/puppet/manifests/site.pp
+
+# Where to log general messages to.
+# 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 
+# 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. 
+# 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 
+# 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 
+# known to work.
+#PUPPETMASTER_PORTS=""
+# Puppetmaster on a different port, run with standard webrick servertype
+#PUPPETMASTER_PORTS="8141"
+# Example with multiple ports which will start puppetmaster with mongrel
+# as a servertype
+PUPPETMASTER_PORTS=( <% puppet_listenports.each do |port| -%><%= port -%> <% end %>)
+
+# You may specify other parameters to the puppetmaster here
+#PUPPETMASTER_EXTRA_OPTS=--noca