Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / postgres / manifests / backup_cluster.pp

diff --git a/modules/postgres/manifests/backup_cluster.pp b/modules/postgres/manifests/backup_cluster.pp
index 83edaf1..eef551b 100644 (file)
--- a/modules/postgres/manifests/backup_cluster.pp
+++ b/modules/postgres/manifests/backup_cluster.pp
@@ -3,14 +3,12 @@ define postgres::backup_cluster(
        $pg_version,
        $pg_cluster = 'main',
        $pg_port = 5432,
-       $backup_servers = getfromhash($site::roles, 'postgres_backup_server'),
+       $backup_servers = getfromhash($deprecated::roles, 'postgres_backup_server'),
        $db_backup_role = 'debian-backup',
        $db_backup_role_password = hkdf('/etc/puppet/secret', "postgresql-${::hostname}-${$pg_cluster}-${pg_port}-backup_role}"),
        $do_role = false,
        $do_hba = false,
 ) {
-       warning("foo ${backup_servers}")
-
        $datadir = "/var/lib/postgresql/${pg_version}/${pg_cluster}"
        file { "${datadir}/.nobackup":
                content  => ""
@@ -39,13 +37,13 @@ define postgres::backup_cluster(
                        }
                }
        }
-       @ferm::rule { "dsa-postgres-${pg_port}":
+       ferm::rule { "dsa-postgres-${pg_port}":
                description => 'Allow postgress access from backup host',
                domain      => '(ip ip6)',
                rule        => "&SERVICE_RANGE(tcp, ${pg_port}, ( @ipfilter((${backup_servers_addrs_joined})) ))",
        }
 
-       postgres::backup_server::register_backup_cluster { "backup-role-${::fqdn}}-${::pg_port}":
+       postgres::backup_server::register_backup_cluster { "backup-role-${::fqdn}}-${pg_port}":
                pg_port => $pg_port,
                pg_role => $db_backup_role,
                pg_password => $db_backup_role_password,