From: Stephen Gran <steve@lobefin.net>
Date: Tue, 24 Feb 2009 16:56:37 +0000 (+0000)
Subject: Typo
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8801de25a475c330caab5dea68c19f538dee3c92;hp=1cee77cd70ab89ba48187d86beff877dc2d0332e;p=mirror%2Fdsa-puppet.git

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

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
new file mode 100644
index 000000000..58b22ab98
--- /dev/null
+++ b/files/etc/puppet/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/files/etc/pupppet/puppet.conf b/files/etc/pupppet/puppet.conf
deleted file mode 100644
index 58b22ab98..000000000
--- a/files/etc/pupppet/puppet.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[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