X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=3eb02d064b5078460bd9c1e03c19637e46e7843a;hb=8532689c735ba87e8c00161224e068c2ba06f640;hp=9134df0658cd0995730ef98ccf43fceb2ff1c771;hpb=b446e957c2907a385168b3ddc7754b127837612f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 9134df065..3eb02d064 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -19,33 +19,33 @@ class roles::pubsub {
 		ssl               => true,
 		ssl_cacert        => '/etc/ssl/debian/certs/ca.crt',
 		ssl_cert          => '/etc/ssl/debian/certs/thishost-server.crt',
-		ssl_key           => '/etc/ssl/debian/keys/thishost-server.key',
+		ssl_key           => '/etc/ssl/private/thishost-server.key',
 		ssl_port          => 5671,
 		ssl_verify        => 'verify_none',
-		manage_repos      => false,
+		repos_ensure      => false,
 	}
 
 	user { 'rabbitmq':
 		groups => 'ssl-cert'
 	}
 
-	@ferm::rule { 'rabbitmq':
+	ferm::rule { 'rabbitmq':
 		description => 'rabbitmq connections',
 		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V4)'
 	}
 
-	@ferm::rule { 'rabbitmq-v6':
+	ferm::rule { 'rabbitmq-v6':
 		domain      => 'ip6',
 		description => 'rabbitmq connections',
 		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V6)'
 	}
 
-	@ferm::rule { 'rabbitmq-adm':
+	ferm::rule { 'rabbitmq-adm':
 		description => 'rabbitmq connections',
 		rule        => '&SERVICE_RANGE(tcp, 5671, $DSA_IPS)'
 	}
 
-	@ferm::rule { 'rabbitmq-v6-adm':
+	ferm::rule { 'rabbitmq-v6-adm':
 		domain      => 'ip6',
 		description => 'rabbitmq connections',
 		rule        => '&SERVICE_RANGE(tcp, 5671, $DSA_V6_IPS)'
@@ -59,21 +59,21 @@ class roles::pubsub {
 		$you6 = '2001:41c8:1000:21::21:16'
 	}
 
-	@ferm::rule { 'rabbitmq_cluster':
+	ferm::rule { 'rabbitmq_cluster':
 		domain      => 'ip',
 		description => 'rabbitmq cluster connections',
 		rule        => "proto tcp mod state state (NEW) saddr (${you}) ACCEPT"
 	}
-	@ferm::rule { 'rabbitmq_cluster_v6':
+	ferm::rule { 'rabbitmq_cluster_v6':
 		domain      => 'ip6',
 		description => 'rabbitmq cluster connections',
 		rule        => "proto tcp mod state state (NEW) saddr (${you6}) ACCEPT"
 	}
-	@ferm::rule { 'rabbitmq_mgmt':
+	ferm::rule { 'rabbitmq_mgmt':
 		description => 'rabbitmq cluster connections',
 		rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_IPS)'
 	}
-	@ferm::rule { 'rabbitmq_mgmt_v6':
+	ferm::rule { 'rabbitmq_mgmt_v6':
 		domain      => '(ip6)',
 		description => 'rabbitmq cluster connections',
 		rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_V6_IPS)'