X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=100850fa2af2b76959cd67835063f16f4b599ddd;hb=821b298ba9b07aeac308e1279e798a9fe8e9aa26;hp=3ae9ba61b6436f58158b3d55b5db8a8006ab8c77;hpb=95cd7ad381e4d3693f51963874ec87ef78a94247;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 3ae9ba61b..100850fa2 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -1,11 +1,11 @@
 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
-	$ftp_password   = $roles::pubsub::params::ftp_password
-	$cc_master      = rainier
-	$cc_secondary   = rapoport
+	$cluster_cookie  = $roles::pubsub::params::cluster_cookie
+
+	$cc_master       = rainier
+	$cc_secondary    = rapoport
 
 	class { 'rabbitmq':
 		cluster           => true,
@@ -28,51 +28,10 @@ class roles::pubsub {
 		source => 'puppet:///modules/roles/pubsub/rabbitmq.config'
 	}
 
-	rabbitmq_user { 'admin':
-		admin    => true,
-		password => $admin_password,
-		provider => 'rabbitmqctl',
-	}
-
-	rabbitmq_user { 'ftpteam':
-		admin    => true,
-		password => $ftp_password,
-		provider => 'rabbitmqctl',
-	}
-
-	rabbitmq_vhost { 'packages':
-		ensure   => present,
-		provider => 'rabbitmqctl',
-	}
-
-	rabbitmq_user_permissions { 'admin@packages':
-		configure_permission => '.*',
-		read_permission      => '.*',
-		write_permission     => '.*',
-		provider             => 'rabbitmqctl',
-		require              => [
-			Rabbitmq_user['admin'],
-			Rabbitmq_vhost['packages']
-		]
-	}
-
-	rabbitmq_user_permissions { 'admin@/':
-		configure_permission => '.*',
-		read_permission      => '.*',
-		write_permission     => '.*',
-		provider             => 'rabbitmqctl',
-		require              => Rabbitmq_user['admin']
-	}
-
-	rabbitmq_user_permissions { 'ftpteam@packages':
-		configure_permission => '.*',
-		read_permission      => '.*',
-		write_permission     => '.*',
-		provider             => 'rabbitmqctl',
-		require              => [
-			Rabbitmq_user['ftpteam'],
-			Rabbitmq_vhost['packages']
-		]
+	concat::fragment { 'rabbit_mgmt_ssl':
+		target => '/etc/rabbitmq/rabbitmq.config',
+		order  => 55,
+		source => 'puppet:///modules/roles/pubsub/rabbitmq-mgmt.config'
 	}
 
 	@ferm::rule { 'rabbitmq':
@@ -86,15 +45,42 @@ class roles::pubsub {
 		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)'
+	}
+
 	if $::hostname == $cc_master {
-		$you = $cc_secondary
+		$you  = '5.153.231.15'
+		$you6 = '2001:41c8:1000:21::21:15'
 	} else {
-		$you = $cc_master
+		$you  = '5.153.231.16'
+		$you6 = '2001:41c8:1000:21::21:16'
 	}
 
 	@ferm::rule { 'rabbitmq_cluster':
-		domain      => '(ip ip6)',
+		domain      => 'ip',
 		description => 'rabbitmq cluster connections',
 		rule        => "proto tcp mod state state (NEW) saddr (${you}) ACCEPT"
 	}
+	@ferm::rule { 'rabbitmq_cluster':
+		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)'
+	}
 }