From: Stephen Gran <steve@lobefin.net>
Date: Sun, 24 Jun 2012 11:03:22 +0000 (+0100)
Subject: puppet.conf reorg
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2eaab21ba472e71a1ed50a45eec4a4bff7e48baa;p=mirror%2Fdsa-puppet.git

puppet.conf reorg

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

diff --git a/modules/debian-org/files/puppet.conf b/modules/debian-org/files/puppet.conf
deleted file mode 100644
index bc4b71764..000000000
--- 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
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 3d2fd217c..5258dfbe6 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -69,7 +69,6 @@ class debian-org {
 		}
 	}
 
-
 	package { 'molly-guard':
 		ensure => installed,
 	}
@@ -156,7 +155,7 @@ class debian-org {
 		notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
 	}
 	file { '/etc/puppet/puppet.conf':
-		source => 'puppet:///modules/debian-org/puppet.conf',
+		content => template('debian-org/puppet.conf.erb'),
 	}
 	file { '/etc/default/puppet':
 		source => 'puppet:///modules/debian-org/puppet.default',
diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
new file mode 100644
index 000000000..67a4d49e2
--- /dev/null
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -0,0 +1,36 @@
+##
+## 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
+
+<%- if scope.lookupvar('::hostname') == 'handel' -%>
+[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
+storeconfigs = true
+dbadapter=mysql
+dbuser=puppet
+dbpassword=Oof0shee6Athoesh
+dbserver=localhost
+<%- end -%>
+
+[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