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

diff --git a/modules/postgres/manifests/init.pp b/modules/postgres/manifests/init.pp
index bb2b7689e..4c2875059 100644
--- a/modules/postgres/manifests/init.pp
+++ b/modules/postgres/manifests/init.pp
@@ -1,19 +1,38 @@
+# base class for a host with postgres installed
+#
+# This just provides some common infrastructure and monitoring.
 class postgres {
-    activate_munin_check {
-        "postgres_bgwriter":;
-        "postgres_connections_db":;
-        "postgres_cache_ALL": script => "postgres_cache_";
-        "postgres_querylength_ALL": script => "postgres_querylength_";
-        "postgres_size_ALL": script => "postgres_size_";
+  $ensure = ($::postgres) ? {
+    true    => 'present',
+    default => 'absent'
+  }
+
+  munin::check { 'postgres_bgwriter':
+    ensure => $ensure,
     }
-    file {
-        "/etc/munin/plugin-conf.d/local-postgres":
-            source  => "puppet:///modules/postgres/plugin.conf",
-            ;
+  munin::check { 'postgres_connections_db':
+    ensure => $ensure,
     }
-}
-
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4:
+  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',
+  }
+}