X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fpostgres%2Fmanifests%2Finit.pp;h=4c28750592720e78f51dd4118d775326e2d904c5;hb=a5118bb7ee4c0ed9c5cea3dcb2243738381467d6;hp=4edc5c8a6e95695004b9133c22a6e6f9cf81238b;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/init.pp b/modules/postgres/manifests/init.pp
index 4edc5c8a6..4c2875059 100644
--- a/modules/postgres/manifests/init.pp
+++ b/modules/postgres/manifests/init.pp
@@ -1,17 +1,38 @@
+# base class for a host with postgres installed
+#
+# This just provides some common infrastructure and monitoring.
 class postgres {
-	munin::check { 'postgres_bgwriter': }
-	munin::check { 'postgres_connections_db': }
-	munin::check { 'postgres_cache_ALL':
-		script => 'postgres_cache_'
-	}
-	munin::check { 'postgres_querylength_ALL':
-		script => 'postgres_querylength_'
-	}
-	munin::check { 'postgres_size_ALL':
-		script => 'postgres_size_'
-	}
+  $ensure = ($::postgres) ? {
+    true    => 'present',
+    default => 'absent'
+  }
 
-	file { '/etc/munin/plugin-conf.d/local-postgres':
-		source  => 'puppet:///modules/postgres/plugin.conf',
-	}
+  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',
+  }
+  file { '/usr/local/sbin/dsa-restart-all-idle-postgres':
+    ensure => $ensure,
+    source => 'puppet:///modules/postgres/dsa-restart-all-idle-postgres',
+    mode   => '0555',
+  }
 }