X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_server.pp;h=4e55a10a28660edbef3a3233e534cc7203044fbc;hb=dc225d5cfa96064a4b8fc49514340491f81b7d61;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..4e55a10a2 100644
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -1,39 +1,41 @@
-#
+# postgres backup server
 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',
+    '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',
-  }
-  concat::fragment { 'make-base-backups-header':
-    target => $postgres::backup_server::globals::make_base_backups,
-    content => template('postgres/backup_server/postgres-make-base-backups.erb'),
-    order  => '00',
+  concat { $postgres::backup_server::globals::base_backup_clusters:
+    ensure_newline => true,
   }
   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 { $make_base_backups:
+    mode    => '0555',
+    content => template('postgres/backup_server/postgres-make-base-backups.erb'),
   }
-  file { '/etc/cron.d/puppet-postgres-make-base-backups': ensure => absent; }
   file { '/var/lib/dsa/postgres-make-base-backups':
     ensure => directory,
-    owner => 'debbackup',
-    mode => '0755',
+    owner  => $postgres::backup_server::globals::backup_unix_user,
+    mode   => '0755',
   }
-  concat::fragment { 'dsa-puppet-stuff--postgres-make_base_backups':
-    target => '/etc/cron.d/dsa-puppet-stuff',
-    content  => @("EOF")
-      */30 * * * * debbackup sleep $(( RANDOM \% 1200 )); chronic ${$postgres::backup_server::globals::make_base_backups}
+  concat::fragment { 'puppet-crontab--postgres-make_base_backups':
+    target  => '/etc/cron.d/puppet-crontab',
+    content => @("EOF")
+      */30 * * * * ${postgres::backup_server::globals::backup_unix_user} sleep $(( RANDOM \% 1200 )); chronic ${make_base_backups}
       | EOF
   }
 
@@ -42,75 +44,61 @@ class postgres::backup_server {
   #
   # do not let other hosts directly build our authorized_keys file,
   # instead go via a script that somewhat validates intput
-  file { '/etc/dsa/postgresql-backup':
-    ensure => 'directory',
-  }
-  file { '/usr/local/bin/postgres-make-backup-sshauthkeys':
-    content => template('postgres/backup_server/postgres-make-backup-sshauthkeys.erb'),
-    mode   => '0555',
-    notify  => Exec['postgres-make-backup-sshauthkeys'],
+  file { '/usr/local/bin/debbackup-ssh-wrap':
+    source => 'puppet:///modules/postgres/backup_server/debbackup-ssh-wrap',
+    mode   => '0555'
   }
   file { '/usr/local/bin/postgres-make-one-base-backup':
-    source  => 'puppet:///modules/postgres/backup_server/postgres-make-one-base-backup',
+    source => 'puppet:///modules/postgres/backup_server/postgres-make-one-base-backup',
     mode   => '0555'
   }
-  file { '/etc/dsa/postgresql-backup/sshkeys-manual':
+  file { "/etc/ssh/userkeys/${postgres::backup_server::globals::backup_unix_user}":
     content => template('postgres/backup_server/sshkeys-manual.erb'),
-    notify  => Exec['postgres-make-backup-sshauthkeys'],
   }
-  concat { $postgres::backup_server::globals::sshkeys_sources:
-    notify  => Exec['postgres-make-backup-sshauthkeys'],
-  }
-  concat::fragment { 'postgresql-backup/source-sshkeys-header':
-    target => $postgres::backup_server::globals::sshkeys_sources ,
-    content  => @(EOF),
-        # <name> <ip addresses> <key>
-        | EOF
-    order  => '00',
-  }
-  Concat::Fragment <<| tag == $postgres::backup_server::globals::tag_source_sshkey |>>
-  exec { "postgres-make-backup-sshauthkeys":
-    command => "/usr/local/bin/postgres-make-backup-sshauthkeys",
-    refreshonly => true,
+  ssh::authorized_key_collect { 'postgres::backup_server':
+    target_user => $postgres::backup_server::globals::backup_unix_user,
+    collect_tag => $postgres::backup_server::globals::tag_source_sshkey,
   }
 
   ####
   # Maintain /etc/nagios/dsa-check-backuppg.conf
   #
-  file { '/etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d':
+  file { '/etc/dsa/postgresql-backup':
     ensure => 'directory',
+  }
+  file { '/etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d':
+    ensure  => 'directory',
     purge   => true,
     force   => true,
     recurse => true,
-    source  => 'puppet:///files/empty/',
-    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 |>>
-  ensure_packages ( "libhash-merge-simple-perl", { ensure => 'installed' })
-  exec { "update dsa-check-backuppg-manual.conf":
-    command  => @(EOF),
+  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
-    provider => shell,
+    provider    => shell,
     refreshonly => true,
   }
 
+  file { '/etc/sudoers.d/backup-server':
+    mode    => '0440',
+    content => template('postgres/backup_server/sudoers.erb'),
+  }
+
+
   ####
   # 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 |>>
 }