Stop special casing godard in postgres::backup_source

diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp
index 3b1e058..b406d0d 100644 (file)
--- a/modules/postgres/manifests/backup_source.pp
+++ b/modules/postgres/manifests/backup_source.pp
@@ -15,10 +15,4 @@ class postgres::backup_source {
   }
 
   ssh::keygen {'postgres': }
-
-
-  if $::hostname in [godard] {
-    postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
-    }
-  }
 }

diff --git a/modules/roles/TODO b/modules/roles/TODO
index 5778cc7..282bf29 100644 (file)
--- a/modules/roles/TODO
+++ b/modules/roles/TODO
@@ -5,3 +5,5 @@
 
 - exim/templates/virtualdomains.erb should be moved into the respective roles
   using exim::vdomain
+
+- move the postgres::backup_server stuff out of the salsa/database manifest

diff --git a/modules/salsa/manifests/database.pp b/modules/salsa/manifests/database.pp
index ba3d173..6a7d8c7 100644 (file)
--- a/modules/salsa/manifests/database.pp
+++ b/modules/salsa/manifests/database.pp
@@ -18,10 +18,6 @@ class salsa::database inherits salsa {
                require => Class['postgresql::server::contrib'],
        }
 
-
-
-       include postgres::backup_source
-
        $pg_config_options = {
                'track_counts'  => 'yes',
                'archive_mode' => 'yes',
@@ -41,10 +37,15 @@ class salsa::database inherits salsa {
                }
        }
 
+       include postgres::backup_source
+
        postgres::backup_cluster { $::hostname:
                pg_version => $postgresql::params::version,
                pg_port => $postgresql::params::port,
                do_role => true,
                do_hba => true,
        }
+
+       postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}":
+       }
 }