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 (file)
index 0000000..3f1f6a9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+puppet.conf

diff --git a/puppet.conf b/puppet.conf
deleted file mode 100644 (file)
index b3958e7..0000000
--- 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