From: Peter Palfrader Date: Sat, 28 Sep 2019 07:39:52 +0000 (+0200) Subject: whitespace/quoting: pubsub X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=c29dc7240f2a85411bd1acb7fb14756251f56109 whitespace/quoting: pubsub --- diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp index 324bac6e6..460066517 100644 --- a/modules/roles/manifests/pubsub.pp +++ b/modules/roles/manifests/pubsub.pp @@ -1,49 +1,49 @@ class roles::pubsub { - include roles::pubsub::params - include roles::pubsub::entities + include roles::pubsub::params + include roles::pubsub::entities - $cluster_cookie = $roles::pubsub::params::cluster_cookie + $cluster_cookie = $roles::pubsub::params::cluster_cookie - $cc_master = rainier - $cc_secondary = rapoport + $cc_master = rainier + $cc_secondary = rapoport - class { 'rabbitmq': - config_cluster => true, - cluster_nodes => [ - $cc_master, - $cc_secondary, - ], - cluster_node_type => 'disc', - erlang_cookie => '8r17so6o1s124ns49sr08n0o24342160', - delete_guest_user => true, - ssl => true, - ssl_cacert => '/etc/ssl/debian/certs/ca.crt', - ssl_cert => '/etc/ssl/debian/certs/thishost-server.crt', - ssl_key => '/etc/ssl/private/thishost-server.key', - ssl_port => 5671, - ssl_verify => 'verify_none', - repos_ensure => false, - } + class { 'rabbitmq': + config_cluster => true, + cluster_nodes => [ + $cc_master, + $cc_secondary, + ], + cluster_node_type => 'disc', + erlang_cookie => '8r17so6o1s124ns49sr08n0o24342160', + delete_guest_user => true, + ssl => true, + ssl_cacert => '/etc/ssl/debian/certs/ca.crt', + ssl_cert => '/etc/ssl/debian/certs/thishost-server.crt', + ssl_key => '/etc/ssl/private/thishost-server.key', + ssl_port => 5671, + ssl_verify => 'verify_none', + repos_ensure => false, + } - user { 'rabbitmq': - groups => 'ssl-cert' - } + user { 'rabbitmq': + groups => 'ssl-cert' + } - ferm::rule { 'rabbitmq': - description => 'rabbitmq connections', - domain => '(ip ip6)', - rule => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN)' - } + ferm::rule { 'rabbitmq': + description => 'rabbitmq connections', + domain => '(ip ip6)', + rule => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN)' + } - if $::hostname == $cc_master { - $other = join(getfromhash($deprecated::allnodeinfo, "${cc_secondary}.debian.org", 'ipHostNumber'), " ") - } else { - $other = join(getfromhash($deprecated::allnodeinfo, "${cc_master}.debian.org", 'ipHostNumber'), " ") - } + if $::hostname == $cc_master { + $other = join(getfromhash($deprecated::allnodeinfo, "${cc_secondary}.debian.org", 'ipHostNumber'), ' ') + } else { + $other = join(getfromhash($deprecated::allnodeinfo, "${cc_master}.debian.org", 'ipHostNumber'), ' ') + } - ferm::rule { 'rabbitmq_cluster': - domain => '(ip ip6)', - description => 'rabbitmq cluster connections', - rule => "proto tcp mod state state (NEW) saddr (${other}) ACCEPT" - } + ferm::rule { 'rabbitmq_cluster': + domain => '(ip ip6)', + description => 'rabbitmq cluster connections', + rule => "proto tcp mod state state (NEW) saddr (${other}) ACCEPT" + } }