change to ssl only port

[dsa-puppet.git] / modules / roles / manifests / pubsub.pp

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index e5740326ef3df0a176c827d8a71349ecdb21b325..3ae9ba61b6436f58158b3d55b5db8a8006ab8c77 100644 (file)
--- 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,15 +64,26 @@ 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)'
+               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)'
        }
 
        if $::hostname == $cc_master {
@@ -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"
        }