X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_server.pp;h=41f415a4b4ec281e20631a169853123fd4a83075;hb=3c9536406517ab5f0a46172e323b199acff2c61c;hp=11eae6af394fe839b91cdb3f97040f7e6e228c66;hpb=b07d4828f3f22e9f4c80709ce2948174f9c1124f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp
index 11eae6af3..41f415a4b 100644
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -2,11 +2,20 @@
 class postgres::backup_server {
   include postgres::backup_server::globals
 
+  ensure_packages ( [
+    'libhash-merge-simple-perl',
+    'libyaml-perl',
+    'python-yaml',
+    'pigz',
+    'postgresql-client',
+    'postgresql-client-9.6',
+  ], {
+    ensure => 'installed'
+  })
+
   ####
   # Regularly pull base backups
   #
-  ensure_packages ( "postgresql-client-9.6", { ensure => 'installed' })
-
   concat { $postgres::backup_server::globals::make_base_backups:
     mode => '0555',
   }
@@ -30,8 +39,8 @@ class postgres::backup_server {
     owner => 'debbackup',
     mode => '0755',
   }
-  concat::fragment { 'dsa-puppet-stuff--postgres-make_base_backups':
-    target => '/etc/cron.d/dsa-puppet-stuff',
+  concat::fragment { 'puppet-crontab--postgres-make_base_backups':
+    target => '/etc/cron.d/puppet-crontab',
     content  => @("EOF")
       */30 * * * * debbackup sleep $(( RANDOM \% 1200 )); chronic ${$postgres::backup_server::globals::make_base_backups}
       | EOF
@@ -90,7 +99,6 @@ class postgres::backup_server {
     notify => Exec['update dsa-check-backuppg-manual.conf']
   }
   File<<| tag == $postgres::backup_server::globals::tag_dsa_check_backupp |>>
-  ensure_packages ( "libhash-merge-simple-perl", { ensure => 'installed' })
   exec { "update dsa-check-backuppg-manual.conf":
     command  => @(EOF),
         perl -MYAML=LoadFile,Dump -MHash::Merge::Simple=merge -E 'say Dump(merge(map{LoadFile($_)}@ARGV))' /etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/*.conf > /etc/nagios/dsa-check-backuppg.conf