From 1e341bf93cda9564ae029683e2e534182ba484a2 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 29 Jul 2012 10:47:22 +0100 Subject: [PATCH] try thin_storeconfigs Signed-off-by: Stephen Gran --- .gitignore | 1 + modules/debian-org/manifests/init.pp | 4 ++++ modules/debian-org/templates/puppet.conf.erb | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index ca0749db..7d2e5d6c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ modules/exim/files/certs/ modules/ssl/files/ modules/dacs/files/private modules/hiera-puppet +modules/puppetmaster/manifests/db.pp *.swp *~ diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 5258dfbe..a12ce2d9 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -154,6 +154,10 @@ class debian-org { source => 'puppet:///modules/debian-org/timezone', notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'], } + if $::hostname == handel { + include puppetmaster::db + $dbpassword = $puppetmaster::db::password + } file { '/etc/puppet/puppet.conf': content => template('debian-org/puppet.conf.erb'), } diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb index db558f0a..f4d97ac9 100644 --- a/modules/debian-org/templates/puppet.conf.erb +++ b/modules/debian-org/templates/puppet.conf.erb @@ -19,6 +19,11 @@ environments = development,testing,production,staging reports = store, http reporturl = http://puppet-dashboard.debian.org:3000/reports/upload config_version = cat /etc/puppet/.config-version +thin_storeconfigs = true +dbadapter=mysql +dbuser=puppet +dbpassword=<% scope.lookupvar('dbpassword') %> +dbserver=localhost <%- end -%> [agent] -- 2.39.2