X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=86b5807a4567efb30678d8c2653e5238673e397f;hb=eeab194fb2334a6e1f9f084cba107e9cf40aa8f7;hp=e8eb2296de942027e55402f19893fbd66b72b3e4;hpb=3d6c976c11b91a41d3977275895f7c74dcee3826;p=dsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index e8eb2296..86b5807a 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -1,90 +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
-	$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,
-		clustermembers    => [
+		config_cluster    => true,
+		cluster_nodes     => [
 			"rabbit@${cc_master}",
 			"rabbit@${cc_secondary}",
 		],
-		clustercookie     => '8r17so6o1s124ns49sr08n0o24342160',
+		cluster_node_type => 'disc',
+		erlang_cookie     => '8r17so6o1s124ns49sr08n0o24342160',
 		delete_guest_user => true,
-		master            => $cc_master,
-	}
-
-	rabbitmq_user { 'admin':
-		admin    => true,
-		password => $admin_password,
-		provider => 'rabbitmqctl',
+		tcp_keepalive     => true,
+		ssl_only          => true,
+		ssl               => true,
+		ssl_cacert        => '/etc/ssl/debian/certs/ca.crt',
+		ssl_cert          => '/etc/ssl/debian/certs/thishost-server.crt',
+		ssl_key           => '/etc/ssl/debian/keys/thishost-server.key',
+		manage_repo       => false,
 	}
 
-	rabbitmq_user { 'ftpteam':
-		admin    => true,
-		password => $ftp_password,
-		provider => 'rabbitmqctl',
+	user { 'rabbitmq':
+		groups => 'ssl-cert'
 	}
 
-	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']
+	@ferm::rule { 'rabbitmq':
+		description => 'rabbitmq connections',
+		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V4)'
 	}
 
-	rabbitmq_user_permissions { 'ftpteam@packages':
-		configure_permission => '.*',
-		read_permission      => '.*',
-		write_permission     => '.*',
-		provider             => 'rabbitmqctl',
-		require              => [
-			Rabbitmq_user['ftpteam'],
-			Rabbitmq_vhost['packages']
-		]
+	@ferm::rule { 'rabbitmq-v6':
+		domain      => 'ip6',
+		description => 'rabbitmq connections',
+		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V6)'
 	}
 
-	@ferm::rule { 'rabbitmq':
+	@ferm::rule { 'rabbitmq-adm':
 		description => 'rabbitmq connections',
-		rule        => '&SERVICE_RANGE(tcp, 5672, $HOST_DEBIAN_V4)'
+		rule        => '&SERVICE_RANGE(tcp, 5671, $DSA_IPS)'
 	}
 
-	@ferm::rule { 'rabbitmq-v6':
+	@ferm::rule { 'rabbitmq-v6-adm':
 		domain      => 'ip6',
 		description => 'rabbitmq connections',
-		rule        => '&SERVICE_RANGE(tcp, 5672, $HOST_DEBIAN_V6)'
+		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_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, 15672, $DSA_IPS)'
+	}
+	@ferm::rule { 'rabbitmq_mgmt_v6':
+		domain      => '(ip6)',
+		description => 'rabbitmq cluster connections',
+		rule        => '&SERVICE_RANGE(tcp, 15672, $DSA_V6_IPS)'
+	}
 }