X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=30ae7098f3fbce631a782e43d40f780b0b3aa229;hb=6f7e7e5506551b4c9d06add3a5610119de7f2bce;hp=20a3bb5a26ebed192e69ad14e03a119cc5aaa88e;hpb=a1853b6ae631104132ba199df406416dd94836cd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 20a3bb5a2..30ae7098f 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -1,49 +1,81 @@
 class roles::pubsub {
 	include roles::pubsub::params
+	include roles::pubsub::entities
 
-	$cluster_cookie = $roles::pubsub::params::cluster_cookie
-	$admin_password = $roles::pubsub::params::admin_password
-	$cc_master      = rainier
-	$cc_secondary   = rapoport
+	$cluster_cookie  = $roles::pubsub::params::cluster_cookie
+
+	$cc_master       = rainier
+	$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'
+	}
+
+	@ferm::rule { 'rabbitmq':
+		description => 'rabbitmq connections',
+		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V4)'
 	}
 
-	rabbitmq_user { 'admin':
-		admin    => true,
-		password => $admin_password,
-		provider => 'rabbitmqctl',
+	@ferm::rule { 'rabbitmq-v6':
+		domain      => 'ip6',
+		description => 'rabbitmq connections',
+		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V6)'
 	}
 
-	rabbitmq_vhost { 'packages':
-		ensure   => present,
-		provider => 'rabbitmqctl',
+	@ferm::rule { 'rabbitmq-adm':
+		description => 'rabbitmq connections',
+		rule        => '&SERVICE_RANGE(tcp, 5671, $DSA_IPS)'
 	}
 
-	rabbitmq_user_permissions { 'admin@packages':
-		configure_permission => '.*',
-		read_permission      => '.*',
-		write_permission     => '.*',
-		provider             => 'rabbitmqctl',
-		require              => [
-			Rabbitmq_user['admin'],
-			Rabbitmq_vhost['packages']
-		]
+	@ferm::rule { 'rabbitmq-v6-adm':
+		domain      => 'ip6',
+		description => 'rabbitmq connections',
+		rule        => '&SERVICE_RANGE(tcp, 5671, $DSA_V6_IPS)'
 	}
 
-	rabbitmq_user_permissions { 'admin@/':
-		configure_permission => '.*',
-		read_permission      => '.*',
-		write_permission     => '.*',
-		provider             => 'rabbitmqctl',
-		require              => Rabbitmq_user['admin']
+	if $::hostname == $cc_master {
+		$you  = '5.153.231.15'
+		$you6 = '2001:41c8:1000:21::21:15'
+	} else {
+		$you  = '5.153.231.16'
+		$you6 = '2001:41c8:1000:21::21:16'
+	}
+
+	@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':
+		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, 15671, $DSA_IPS)'
+	}
+	@ferm::rule { 'rabbitmq_mgmt_v6':
+		domain      => '(ip6)',
+		description => 'rabbitmq cluster connections',
+		rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_V6_IPS)'
 	}
 }