Move backup-server specific sudoers entries out of debian-global sudo

[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 1f95f3e..a4c6689 100644 (file)
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -2,6 +2,8 @@
 class postgres::backup_server {
   include postgres::backup_server::globals
 
+  $make_base_backups = '/usr/local/bin/postgres-make-base-backups'
+
   ensure_packages ( [
     'libhash-merge-simple-perl',
     'libyaml-perl',
@@ -21,7 +23,7 @@ class postgres::backup_server {
   }
   Concat::Fragment <<| tag == $postgres::backup_server::globals::tag_base_backup |>>
 
-  file { $postgres::backup_server::globals::make_base_backups:
+  file { $make_base_backups:
     mode    => '0555',
     content => template('postgres/backup_server/postgres-make-base-backups.erb'),
   }
@@ -33,7 +35,7 @@ class postgres::backup_server {
   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}
+      */30 * * * * debbackup sleep $(( RANDOM \% 1200 )); chronic ${make_base_backups}
       | EOF
   }
 
@@ -82,14 +84,14 @@ class postgres::backup_server {
     purge   => true,
     force   => true,
     recurse => true,
-    notify  => Exec['update dsa-check-backuppg-manual.conf'],
+    notify  => Exec['update dsa-check-backuppg.conf'],
   }
-  file { '/etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/manual.conf':
-    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/globals.conf':
+    content => template('postgres/backup_server/dsa-check-backuppg-globals.conf.erb'),
+    notify  => Exec['update dsa-check-backuppg.conf']
   }
   File<<| tag == $postgres::backup_server::globals::tag_dsa_check_backupp |>>
-  exec { 'update dsa-check-backuppg-manual.conf':
+  exec { 'update dsa-check-backuppg.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
         | EOF
@@ -97,6 +99,12 @@ class postgres::backup_server {
     refreshonly => true,
   }
 
+  file { '/etc/sudoers.d/backup-server':
+    mode    => '0440',
+    content => template('postgres/backup_server/sudoers.erb'),
+  }
+
+
   ####
   # Maintain .pgpass file on backup servers
   # #