Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

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

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 338282a..38b55f7 100644 (file)
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -16,12 +16,10 @@ class roles::pubsub {
                cluster_node_type => 'disc',
                erlang_cookie     => '8r17so6o1s124ns49sr08n0o24342160',
                delete_guest_user => true,
-               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',
+               ssl_key           => '/etc/ssl/private/thishost-server.key',
                ssl_port          => 5671,
                ssl_verify        => 'verify_none',
                manage_repos      => false,
@@ -73,11 +71,11 @@ class roles::pubsub {
        }
        @ferm::rule { 'rabbitmq_mgmt':
                description => 'rabbitmq cluster connections',
-               rule        => '&SERVICE_RANGE(tcp, 15672, $DSA_IPS)'
+               rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_IPS)'
        }
        @ferm::rule { 'rabbitmq_mgmt_v6':
                domain      => '(ip6)',
                description => 'rabbitmq cluster connections',
-               rule        => '&SERVICE_RANGE(tcp, 15672, $DSA_V6_IPS)'
+               rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_V6_IPS)'
        }
 }