Skip to content

Commit

Permalink
Style fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ashley Penney committed Jul 10, 2013
1 parent 8215195 commit f15774d
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 28 deletions.
29 changes: 14 additions & 15 deletions manifests/repo/rhel.pp
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
class rabbitmq::repo::rhel (
$key = "http://www.rabbitmq.com/rabbitmq-signing-key-public.asc",
$version = "2.8.4",
$relversion = "1",
) {
exec { "rpm --import ${key}":
path => ["/bin","/usr/bin","/sbin","/usr/sbin"],
onlyif => 'test `rpm -qa | grep gpg-pubkey-056e8e56-468e43f2 | wc -l` -eq 0';
}
$key = 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc',
$version = '2.8.4',
$relversion = '1',
) {
exec { "rpm --import ${key}":
path => ['/bin','/usr/bin','/sbin','/usr/sbin'],
onlyif => 'test `rpm -qa | grep gpg-pubkey-056e8e56-468e43f2 | wc -l` -eq 0';
}

package { "rabbitmq-server":
provider => rpm,
ensure => installed,
source => "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/rabbitmq-server-${version}-${relversion}.noarch.rpm",
require => Exec["rpm --import ${key}"],
}
package { 'rabbitmq-server':
ensure => installed,
provider => rpm,
source => "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/rabbitmq-server-${version}-${relversion}.noarch.rpm",
require => Exec["rpm --import ${key}"],
}

}

8 changes: 4 additions & 4 deletions manifests/server.pp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# [*cluster_disk_nodes*] - which nodes to cluster with (including the current one)
# [*erlang_cookie*] - erlang cookie, must be the same for all nodes in a cluster
# [*wipe_db_on_cookie_change*] - whether to wipe the RabbitMQ data if the specified
# erlang_cookie differs from the current one. This is a sad parameter: actually,
# erlang_cookie differs from the current one. This is a sad parameter: actually,
# if the cookie indeed differs, then wiping the database is the *only* thing you
# can do. You're only required to set this parameter to true as a sign that you
# realise this.
Expand Down Expand Up @@ -95,9 +95,9 @@

if $config_cluster {
file { 'erlang_cookie':
path =>"/var/lib/rabbitmq/.erlang.cookie",
owner => rabbitmq,
group => rabbitmq,
path => '/var/lib/rabbitmq/.erlang.cookie',
owner => 'rabbitmq',
group => 'rabbitmq',
mode => '0400',
content => $erlang_cookie,
replace => true,
Expand Down
6 changes: 3 additions & 3 deletions tests/full.pp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class { 'rabbitmq::repo::apt':
class { 'rabbitmq::repo::apt':
pin => '900',
}->
class { 'rabbitmq::server':
Expand All @@ -10,12 +10,12 @@
password => 'pass',
provider => 'rabbitmqctl',
}->
rabbitmq_vhost { 'myhost':
rabbitmq_vhost { 'myhost':
provider => 'rabbitmqctl',
}
rabbitmq_user_permissions { 'dan@myhost':
configure_permission => '.*',
read_permission => '.*',
write_permission => '.*',
provider => 'rabbitmqctl',
provider => 'rabbitmqctl',
}
4 changes: 2 additions & 2 deletions tests/permissions/add.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
rabbitmq_vhost { 'test5': }
rabbitmq_user_permissions { 'blah7@test5':
configure_permission => 'config2',
read_permission => 'ready',
#write_permission => 'ready',
read_permission => 'ready',
#write_permission => 'ready',
}
2 changes: 1 addition & 1 deletion tests/plugin.pp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
config_stomp => true,
}

$rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]
$rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]

rabbitmq_plugin { $rabbitmq_plugins:
ensure => present,
Expand Down
4 changes: 2 additions & 2 deletions tests/server.pp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class { 'rabbitmq::server':
port => '5672',
port => '5672',
delete_guest_user => true,
version => 'latest',
version => 'latest',
}
2 changes: 1 addition & 1 deletion tests/user/add.pp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rabbitmq_user { ['blah2', 'blah3', 'blah4']:
password => 'phoey!',
# provider => 'rabbitmqctl',
#provider => 'rabbitmqctl',
}

0 comments on commit f15774d

Please sign in to comment.