X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_server.pp;h=4d78c99aa8f221008c24a2cf796c2cd7e453d171;hb=fa67a3c70b0ad6f46691ee1495dfa7f249143d52;hp=a4c6689db6b76fc743bbc740b0d99bc2bd94e42f;hpb=a5118bb7ee4c0ed9c5cea3dcb2243738381467d6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_server.pp b/modules/postgres/manifests/backup_server.pp
index a4c6689db..4d78c99aa 100644
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -29,13 +29,13 @@ class postgres::backup_server {
   }
   file { '/var/lib/dsa/postgres-make-base-backups':
     ensure => directory,
-    owner  => 'debbackup',
+    owner  => $postgres::backup_server::globals::backup_unix_user,
     mode   => '0755',
   }
   concat::fragment { 'puppet-crontab--postgres-make_base_backups':
     target  => '/etc/cron.d/puppet-crontab',
     content => @("EOF")
-      */30 * * * * debbackup sleep $(( RANDOM \% 1200 )); chronic ${make_base_backups}
+      */30 * * * * ${postgres::backup_server::globals::backup_unix_user} sleep $(( RANDOM \% 1200 )); chronic ${make_base_backups}
       | EOF
   }
 
@@ -109,14 +109,9 @@ class postgres::backup_server {
   # Maintain .pgpass file on backup servers
   # #
   concat { $postgres::backup_server::globals::pgpassfile:
-    owner => 'debbackup',
-    group => 'debbackup',
+    owner => $postgres::backup_server::globals::backup_unix_user,
+    group => $postgres::backup_server::globals::backup_unix_group,
     mode  => '0400'
   }
-  concat::fragment{ 'pgpass-local':
-    target => $postgres::backup_server::globals::pgpassfile,
-    source => '/home/debbackup/.pgpass-local',
-    order  => '00'
-  }
   Concat::Fragment <<| tag == $postgres::backup_server::globals::tag_source_pgpassline |>>
 }