Move list of clusters to make a base backup of from the script to a conffile

[mirror/dsa-puppet.git] / modules / postgres / manifests / backup_server.pp

diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp
index 41f415a..0da5594 100644 (file)
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -16,24 +16,15 @@ class postgres::backup_server {
   ####
   # Regularly pull base backups
   #
-  concat { $postgres::backup_server::globals::make_base_backups:
-    mode => '0555',
+  concat { $postgres::backup_server::globals::base_backup_clusters:
+    ensure_newline => true,
   }
-  concat::fragment { 'make-base-backups-header':
-    target => $postgres::backup_server::globals::make_base_backups,
+  Concat::Fragment <<| tag == $postgres::backup_server::globals::tag_base_backup |>>
+
+  file { '/usr/local/bin/postgres-make-base-backups':
+    mode    => '0555',
     content => template('postgres/backup_server/postgres-make-base-backups.erb'),
-    order  => '00',
   }
-  Concat::Fragment <<| tag == $postgres::backup_server::globals::tag_base_backup |>>
-  concat::fragment { 'make-base-backups-tail':
-    target => $postgres::backup_server::globals::make_base_backups,
-    content  => @(EOTEMPLATE),
-        # EOF by make-base-backups-tail fragment
-        EOF
-        | EOTEMPLATE
-    order  => '99',
-  }
-  file { '/etc/cron.d/puppet-postgres-make-base-backups': ensure => absent; }
   file { '/var/lib/dsa/postgres-make-base-backups':
     ensure => directory,
     owner => 'debbackup',