ca.pem -> ca.crt

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

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 100850fa2af2b76959cd67835063f16f4b599ddd..9134df0658cd0995730ef98ccf43fceb2ff1c771 100644 (file)
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -8,32 +8,27 @@ class roles::pubsub {
        $cc_secondary    = rapoport
 
        class { 'rabbitmq':
-               cluster           => true,
-               clustermembers    => [
-                       "rabbit@${cc_master}",
-                       "rabbit@${cc_secondary}",
+               config_cluster    => true,
+               cluster_nodes     => [
+                       $cc_master,
+                       $cc_secondary,
                ],
-               clustercookie     => '8r17so6o1s124ns49sr08n0o24342160',
+               cluster_node_type => 'disc',
+               erlang_cookie     => '8r17so6o1s124ns49sr08n0o24342160',
                delete_guest_user => true,
-               master            => $cc_master,
+               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_port          => 5671,
+               ssl_verify        => 'verify_none',
+               manage_repos      => false,
        }
 
        user { 'rabbitmq':
                groups => 'ssl-cert'
        }
 
-       concat::fragment { 'rabbit_ssl':
-               target => '/etc/rabbitmq/rabbitmq.config',
-               order  => 35,
-               source => 'puppet:///modules/roles/pubsub/rabbitmq.config'
-       }
-
-       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, 5671, $HOST_DEBIAN_V4)'
@@ -69,18 +64,18 @@ class roles::pubsub {
                description => 'rabbitmq cluster connections',
                rule        => "proto tcp mod state state (NEW) saddr (${you}) ACCEPT"
        }
-       @ferm::rule { 'rabbitmq_cluster':
+       @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)'
+               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)'
        }
 }