From 2eaab21ba472e71a1ed50a45eec4a4bff7e48baa Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 24 Jun 2012 12:03:22 +0100 Subject: [PATCH] puppet.conf reorg Signed-off-by: Stephen Gran --- modules/debian-org/manifests/init.pp | 3 +-- .../{files/puppet.conf => templates/puppet.conf.erb} | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) rename modules/debian-org/{files/puppet.conf => templates/puppet.conf.erb} (84%) 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/files/puppet.conf b/modules/debian-org/templates/puppet.conf.erb similarity index 84% rename from modules/debian-org/files/puppet.conf rename to modules/debian-org/templates/puppet.conf.erb index bc4b71764..67a4d49e2 100644 --- a/modules/debian-org/files/puppet.conf +++ b/modules/debian-org/templates/puppet.conf.erb @@ -13,11 +13,18 @@ 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 -- 2.20.1