X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=d165fccb596bdbda87346b55b60c32270e13cb29;hb=c744e409e7024a4c41238cc93d7f18e29ab667f6;hp=86b5807a4567efb30678d8c2653e5238673e397f;hpb=eeab194fb2334a6e1f9f084cba107e9cf40aa8f7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 86b5807a4..d165fccb5 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -10,72 +10,47 @@ class roles::pubsub {
 	class { 'rabbitmq':
 		config_cluster    => true,
 		cluster_nodes     => [
-			"rabbit@${cc_master}",
-			"rabbit@${cc_secondary}",
+			$cc_master,
+			$cc_secondary,
 		],
 		cluster_node_type => 'disc',
 		erlang_cookie     => '8r17so6o1s124ns49sr08n0o24342160',
 		delete_guest_user => true,
-		tcp_keepalive     => true,
-		ssl_only          => true,
 		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',
-		manage_repo       => false,
+		ssl_key           => '/etc/ssl/private/thishost-server.key',
+		ssl_port          => 5671,
+		ssl_verify        => 'verify_none',
+		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':
-		domain      => 'ip6',
-		description => 'rabbitmq connections',
-		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V6)'
-	}
-
-	@ferm::rule { 'rabbitmq-adm':
-		description => 'rabbitmq connections',
-		rule        => '&SERVICE_RANGE(tcp, 5671, $DSA_IPS)'
-	}
-
-	@ferm::rule { 'rabbitmq-v6-adm':
-		domain      => 'ip6',
-		description => 'rabbitmq connections',
-		rule        => '&SERVICE_RANGE(tcp, 5671, $DSA_V6_IPS)'
+		domain      => '(ip ip6)',
+		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN)'
 	}
 
 	if $::hostname == $cc_master {
-		$you  = '5.153.231.15'
-		$you6 = '2001:41c8:1000:21::21:15'
+		$you  = '82.195.75.95'
+		$you6 = '2001:41b8:202:deb::311:95'
 	} else {
-		$you  = '5.153.231.16'
-		$you6 = '2001:41c8:1000:21::21:16'
+		$you  = '82.195.75.94'
+		$you6 = '2001:41b8:202:deb::311:94'
 	}
 
-	@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':
-		description => 'rabbitmq cluster connections',
-		rule        => '&SERVICE_RANGE(tcp, 15672, $DSA_IPS)'
-	}
-	@ferm::rule { 'rabbitmq_mgmt_v6':
-		domain      => '(ip6)',
-		description => 'rabbitmq cluster connections',
-		rule        => '&SERVICE_RANGE(tcp, 15672, $DSA_V6_IPS)'
-	}
 }