X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_server.pp;h=5a8aa8353b01b089c79aefbbc686c7356860df3d;hb=cbf1fa5775dcece566add206a2f904ec6fcacfe2;hp=a5361b1e1cd52080914fc826ab7a881adb8ecc9e;hpb=f5bdff6b668ca7c9e51c2a6d557c76b19cb8187d;p=mirror%2Fdsa-puppet.git diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp index a5361b1e1..5a8aa8353 100644 --- a/modules/postgres/manifests/backup_server.pp +++ b/modules/postgres/manifests/backup_server.pp @@ -16,8 +16,7 @@ class postgres::backup_server { #### # Regularly pull base backups # - ensure_packages ( "postgresql-client-9.1", { ensure => 'installed' }) - ensure_packages ( "postgresql-client-9.4", { ensure => 'installed' }) + ensure_packages ( "postgresql-client-9.6", { ensure => 'installed' }) concat { $postgres::backup_server::globals::make_base_backups: mode => '0555', @@ -101,10 +100,6 @@ class postgres::backup_server { content => template('postgres/backup_server/dsa-check-backuppg-manual.conf.erb'), notify => Exec['update dsa-check-backuppg-manual.conf'] } - file { '/etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/moszumanska.conf': - ensure => 'absent', - 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":