X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Fmanifests%2Fbackup_cluster.pp;h=eef551bf27cffcfdec19e75db3a7544789de3cef;hb=d5ce68a830c42fd613e08e377ace6348a2799e9d;hp=83edaf17f026a8d99db8715bbde36afeda938b56;hpb=1cb97228cc59907f5eacbd5927e74c715000ac6c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/manifests/backup_cluster.pp b/modules/postgres/manifests/backup_cluster.pp
index 83edaf17f..eef551bf2 100644
--- 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,