puppet.conf reorg

[mirror/dsa-puppet.git] / modules / debian-org / files / puppet.conf

diff --git a/modules/debian-org/files/puppet.conf b/modules/debian-org/files/puppet.conf
deleted file mode 100644 (file)
index bc4b717..0000000
--- a/modules/debian-org/files/puppet.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-[main]
-logdir=/var/log/puppet
-vardir=/var/lib/puppet
-ssldir=/var/lib/puppet/ssl
-rundir=/var/run/puppet
-factpath=$vardir/lib/facter
-pluginsync=true
-# This is the default environment for all clients
-environment=production
-
-[master]
-environments = development,testing,production,staging
-reports = store, http
-reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
-config_version = cat /etc/puppet/.config-version
-
-[agent]
-environments = development,testing,production,staging
-report = true
-
-[staging]
-manifestdir=/srv/puppet.debian.org/stages/staging/manifests
-fileserverconfig=/srv/puppet.debian.org/stages/staging/fileserver.conf
-modulepath=/srv/puppet.debian.org/stages/staging/modules