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

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 8ebe3e70b..3eb02d064 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -8,49 +8,44 @@ class roles::pubsub {
 	$cc_secondary    = rapoport
 
 	class { 'rabbitmq':
-		cluster           => true,
-		clustermembers    => [
-			"rabbit@${cc_master}",
-			"rabbit@${cc_secondary}",
+		config_cluster    => true,
+		cluster_nodes     => [
+			$cc_master,
+			$cc_secondary,
 		],
-		clustercookie     => '8r17so6o1s124ns49sr08n0o24342160',
+		cluster_node_type => 'disc',
+		erlang_cookie     => '8r17so6o1s124ns49sr08n0o24342160',
 		delete_guest_user => true,
-		master            => $cc_master,
+		ssl               => true,
+		ssl_cacert        => '/etc/ssl/debian/certs/ca.crt',
+		ssl_cert          => '/etc/ssl/debian/certs/thishost-server.crt',
+		ssl_key           => '/etc/ssl/private/thishost-server.key',
+		ssl_port          => 5671,
+		ssl_verify        => 'verify_none',
+		repos_ensure      => false,
 	}
 
 	user { 'rabbitmq':
 		groups => 'ssl-cert'
 	}
 
-	concat::fragment { 'rabbit_ssl':
-		target => '/etc/rabbitmq/rabbitmq.config',
-		order  => 35,
-		source => 'puppet:///modules/roles/pubsub/rabbitmq.config'
-	}
-
-	concat::fragment { 'rabbit_mgmt_ssl':
-		target => '/etc/rabbitmq/rabbitmq.config',
-		order  => 55,
-		source => 'puppet:///modules/roles/pubsub/rabbitmq-mgmt.config'
-	}
-
-	@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)'
@@ -64,23 +59,23 @@ 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, 15672, $DSA_IPS)'
+		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, 15672, $DSA_V6_IPS)'
+		rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_V6_IPS)'
 	}
 }