Move backup_server:: globals, register_backup_cluster, register_backup_clienthost...

[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 95fe38c..aab56bf 100644 (file)
--- a/modules/postgres/manifests/backup_server.pp
+++ b/modules/postgres/manifests/backup_server.pp
@@ -1,23 +1,11 @@
 #
-class postgres::backup_server::globals {
-       $make_base_backups = '/usr/local/bin/postgres-make-base-backups'
-       $pgpassfile = '/home/debbackup/.pgpass'
-       $sshkeys_sources = '/etc/dsa/postgresql-backup/sshkeys-sources'
-
-       $tag_base_backup = "postgresql::server::backup-source-make-base-backup-entry"
-       $tag_source_sshkey = "postgresql::server::backup-source-sshkey"
-       $tag_source_pgpassline = "postgresql::server::backup-source-pgpassline"
-       $tag_dsa_check_backupp = "postgresql::server::backup-dsa-check-backuppg"
-}
-
 class postgres::backup_server {
        include postgres::backup_server::globals
 
        ####
        # 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',
@@ -45,7 +33,7 @@ class postgres::backup_server {
        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}
+                       */30 * * * * debbackup sleep $(( RANDOM \% 1200 )); chronic ${$postgres::backup_server::globals::make_base_backups}
                        | EOF
        }
 
@@ -101,19 +89,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 => ($::hostname in [backuphost]) ? {
-                               true    => 'absent',
-                               default => 'present'
-                       },
-               content  => @(EOF),
-                               --- 
-                               backups:
-                                 moszumanska:
-                                   main:
-                               | EOF
-               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":
@@ -139,63 +114,3 @@ class postgres::backup_server {
        }
        Concat::Fragment <<| tag == $postgres::backup_server::globals::tag_source_pgpassline |>>
 }
-
-define postgres::backup_server::register_backup_clienthost (
-       $sshpubkey = $::postgresql_key,
-       $ipaddrlist = join(getfromhash($site::nodeinfo, 'ldap', 'ipHostNumber'), ","),
-       $hostname = $::hostname,
-) {
-       include postgres::backup_server::globals
-
-       if $sshpubkey {
-               $addr = assert_type(String[1], $ipaddrlist)
-               @@concat::fragment { "postgresql::server::backup-source-clienthost::$name::$fqdn":
-                       target => $postgres::backup_server::globals::sshkeys_sources ,
-                       content  => @("EOF"),
-                                       ${hostname} ${addr} ${sshpubkey}
-                                       | EOF
-                       tag     => $postgres::backup_server::globals::tag_source_sshkey,
-               }
-       }
-}
-
-define postgres::backup_server::register_backup_cluster (
-       $hostname = $::hostname,
-       $fqdn = $::fqdn,
-       $pg_port,
-       $pg_role,
-       $pg_password,
-       $pg_cluster,
-       $pg_version,
-) {
-       include postgres::backup_server::globals
-
-       # foobar.debian.org:5432:*:debian-backup:swordfish
-       @@concat::fragment { "postgresql::server::backup-source-pgpassline::$hostname::$pg_port::$pg_role":
-               target => $postgres::backup_server::globals::pgpassfile,
-               content => @("EOF"),
-                               ${fqdn}:${pg_port}:*:${pg_role}:${pg_password}
-                               | EOF
-               tag     => $postgres::backup_server::globals::tag_source_pgpassline,
-       }
-       #
-       # vittoria.debian.org   5432    debian-backup           main            9.6
-       @@concat::fragment { "postgresql::server::backup-source-make-base-backup-entry::$hostname::$pg_port::$pg_role":
-               target => $postgres::backup_server::globals::make_base_backups,
-               content => @("EOF"),
-                               ${fqdn} ${pg_port}      ${pg_role}      ${pg_cluster}   ${pg_version}
-                               | EOF
-               tag     => $postgres::backup_server::globals::tag_base_backup,
-       }
-
-       @@file { "/etc/dsa/postgresql-backup/dsa-check-backuppg.conf.d/${hostname}-${pg_cluster}.conf":
-               content  => @("EOF"),
-                               --- 
-                               backups:
-                                 ${hostname}:
-                                   ${pg_cluster}:
-                               | EOF
-               tag     => $postgres::backup_server::globals::tag_dsa_check_backupp,
-               notify  => Exec['update dsa-check-backuppg-manual.conf']
-       }
-}