From: Stephen Gran <steve@lobefin.net>
Date: Sun, 1 Mar 2009 13:37:09 +0000 (+0000)
Subject: We want to ignore puppet.conf at this level of the tree
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=c3fe1bd04513199004b35761ccb2c23350738a78

We want to ignore puppet.conf at this level of the tree
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..3f1f6a9e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+puppet.conf
diff --git a/puppet.conf b/puppet.conf
deleted file mode 100644
index b3958e7c..00000000
--- a/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/facts
-pluginsync=true
-
-[puppetmasterd]
-templatedir=/var/lib/puppet/templates