From: Stephen Gran <steve@lobefin.net>
Date: Tue, 24 Feb 2009 16:53:23 +0000 (+0000)
Subject: Is it wrong to configure puppet with puppet?
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=cba7f7a30f6d30cddb1396e500402f753d1a67f2;p=mirror%2Fdsa-puppet.git

Is it wrong to configure puppet with puppet?
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/files/etc/pupppet/puppet.conf b/files/etc/pupppet/puppet.conf
new file mode 100644
index 000000000..58b22ab98
--- /dev/null
+++ b/files/etc/pupppet/puppet.conf
@@ -0,0 +1,10 @@
+[main]
+logdir=/var/log/puppet
+vardir=/var/lib/puppet
+ssldir=/var/lib/puppet/ssl
+rundir=/var/run/puppet
+factpath=$vardir/lib/facter
+pluginsync=false
+
+[puppetmasterd]
+templatedir=/var/lib/puppet/templates
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 761340784..0b3c6cb21 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -52,5 +52,11 @@ class debian-org {
              mode    => 644,
              ensure  => file,
              source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
+      "/etc/puppet/puppet.conf":
+             owner   => root,
+             group   => root,
+             mode    => 644,
+             ensure  => file,
+             source => "puppet:///files/etc/puppet/puppet.conf";
    }
 }