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

diff --git a/modules/postgres/manifests/backup_cluster.pp b/modules/postgres/manifests/backup_cluster.pp
index 989b93a43..eef551bf2 100644
--- a/modules/postgres/manifests/backup_cluster.pp
+++ b/modules/postgres/manifests/backup_cluster.pp
@@ -3,7 +3,7 @@ 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,
@@ -37,7 +37,7 @@ 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})) ))",