remove postgres things if we do not have postgresql

diff --git a/manifests/site.pp b/manifests/site.pp
index 55d18f8..8e72e7d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,6 +41,7 @@ node default {
        include multipath
        include popcon
        include portforwarder
+       include postgres
 
        if $::lsbdistcodename == squeeze {
                include roles::udldap::client
@@ -114,10 +115,6 @@ node default {
                include debian_org::radvd
        }
 
-       if ($::postgres) {
-               include postgres
-       }
-
        if $::spamd {
                munin::check { 'spamassassin': }
        }

diff --git a/modules/postgres/manifests/init.pp b/modules/postgres/manifests/init.pp
index 4edc5c8..af2f206 100644 (file)
--- a/modules/postgres/manifests/init.pp
+++ b/modules/postgres/manifests/init.pp
@@ -1,17 +1,30 @@
 class postgres {
-       munin::check { 'postgres_bgwriter': }
-       munin::check { 'postgres_connections_db': }
+       $ensure = ($::postgres) ? {
+               true    => 'ensure',
+               default => 'absent'
+       }
+
+       munin::check { 'postgres_bgwriter':
+               ensure => $ensure,
+               }
+       munin::check { 'postgres_connections_db':
+               ensure => $ensure,
+               }
        munin::check { 'postgres_cache_ALL':
+               ensure => $ensure,
                script => 'postgres_cache_'
        }
        munin::check { 'postgres_querylength_ALL':
+               ensure => $ensure,
                script => 'postgres_querylength_'
        }
        munin::check { 'postgres_size_ALL':
+               ensure => $ensure,
                script => 'postgres_size_'
        }
 
        file { '/etc/munin/plugin-conf.d/local-postgres':
+               ensure => $ensure,
                source  => 'puppet:///modules/postgres/plugin.conf',
        }
 }