X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=2f02be0d329403e57da2d2c08f3f41bc9ce8f533;hb=15febe66e4a016e8d5823047811b47abf8789378;hp=61a93bf3f831617318331d9b06ad8c1f9314310d;hpb=29e997fcfccb12a19b9871228005d14fc6b9189e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 61a93bf3f..2f02be0d3 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -1,10 +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
-	$cc_master      = rainier
-	$cc_secondary   = rapoport
+	$cluster_cookie  = $roles::pubsub::params::cluster_cookie
+
+	$cc_master       = rainier
+	$cc_secondary    = rapoport
 
 	class { 'rabbitmq':
 		cluster           => true,
@@ -17,45 +18,42 @@ class roles::pubsub {
 		master            => $cc_master,
 	}
 
-	rabbitmq_user { 'admin':
-		admin    => true,
-		password => $admin_password,
-		provider => 'rabbitmqctl',
-	}
-
-	rabbitmq_vhost { 'packages':
-		ensure   => present,
-		provider => 'rabbitmqctl',
+	user { 'rabbitmq':
+		groups => 'ssl-cert'
 	}
 
-	rabbitmq_user_permissions { 'admin@packages':
-		configure_permission => '.*',
-		read_permission      => '.*',
-		write_permission     => '.*',
-		provider             => 'rabbitmqctl',
-		require              => [
-			Rabbitmq_user['admin'],
-			Rabbitmq_vhost['packages']
-		]
+	concat::fragment { 'rabbit_ssl':
+		target => '/etc/rabbitmq/rabbitmq.config',
+		order  => 35,
+		source => 'puppet:///modules/roles/pubsub/rabbitmq.config'
 	}
 
-	rabbitmq_user_permissions { 'admin@/':
-		configure_permission => '.*',
-		read_permission      => '.*',
-		write_permission     => '.*',
-		provider             => 'rabbitmqctl',
-		require              => Rabbitmq_user['admin']
+	concat::fragment { 'rabbit_mgmt_ssl':
+		target => '/etc/rabbitmq/rabbitmq.config',
+		order  => 55,
+		source => 'puppet:///modules/roles/pubsub/rabbitmq-mgmt.config'
 	}
 
 	@ferm::rule { 'rabbitmq':
 		description => 'rabbitmq connections',
-		rule        => '&SERVICE_RANGE(tcp, 5672, $HOST_DEBIAN_V4)'
+		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V4)'
 	}
 
 	@ferm::rule { 'rabbitmq-v6':
 		domain      => 'ip6',
 		description => 'rabbitmq connections',
-		rule        => '&SERVICE_RANGE(tcp, 5672, $HOST_DEBIAN_V6)'
+		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 {
@@ -69,4 +67,13 @@ class roles::pubsub {
 		description => 'rabbitmq cluster connections',
 		rule        => "proto tcp mod state state (NEW) saddr (${you}) 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)'
+	}
 }