X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=e57e116249a7b7d1024b158b4393858affea7487;hb=1b9d2fa8947f8d2e1f32190ff6129ff3e6f2d56c;hp=e5740326ef3df0a176c827d8a71349ecdb21b325;hpb=88395362f4990b19bb098d0d4a487e77844b51fc;p=dsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index e5740326..e57e1162 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -3,6 +3,7 @@ class roles::pubsub {
 
 	$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
 
@@ -17,12 +18,28 @@ class roles::pubsub {
 		master            => $cc_master,
 	}
 
+	user { 'rabbitmq':
+		groups => 'ssl-cert'
+	}
+
+	concat::fragment { 'rabbit_ssl':
+		target => '/etc/rabbitmq/rabbitmq.config',
+		order  => 35,
+		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',
@@ -47,6 +64,17 @@ class roles::pubsub {
 		require              => Rabbitmq_user['admin']
 	}
 
+	rabbitmq_user_permissions { 'ftpteam@packages':
+		configure_permission => '.*',
+		read_permission      => '.*',
+		write_permission     => '.*',
+		provider             => 'rabbitmqctl',
+		require              => [
+			Rabbitmq_user['ftpteam'],
+			Rabbitmq_vhost['packages']
+		]
+	}
+
 	@ferm::rule { 'rabbitmq':
 		description => 'rabbitmq connections',
 		rule        => '&SERVICE_RANGE(tcp, 5672, $HOST_DEBIAN_V4)'
@@ -65,7 +93,7 @@ class roles::pubsub {
 	}
 
 	@ferm::rule { 'rabbitmq_cluster':
-		domain      => '(ip,ip6)',
+		domain      => '(ip ip6)',
 		description => 'rabbitmq cluster connections',
 		rule        => "proto tcp mod state state (NEW) saddr (${you}) ACCEPT"
 	}