Merge pull request #184 from matjohn2/master

Change default vhost to not include a slash and other readme fixes
sensu · May 29, 2014 · 2f22c28 · 2f22c28
2 parents 7b33ef1 + 4d00cc8
commit 2f22c28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -71,7 +71,7 @@
 #
 # [*rabbitmq_vhost*]
 #   String.  Rabbitmq vhost to be used by sensu
-#   Default: '/sensu'
+#   Default: 'sensu'
 #
 # [*rabbitmq_ssl_private_key*]
 #   String.  Private key to be used by sensu to connect to rabbitmq

diff --git a/spec/classes/sensu_rabbitmq_spec.rb b/spec/classes/sensu_rabbitmq_spec.rb
@@ -21,7 +21,7 @@
         :rabbitmq_host            => 'myhost',
         :rabbitmq_user            => 'sensuuser',
         :rabbitmq_password        => 'sensupass',
-        :rabbitmq_vhost           => '/myvhost',
+        :rabbitmq_vhost           => 'myvhost',
       } }
 
       it { should_not contain_file('/etc/sensu/ssl/cert.pem') }
@@ -32,7 +32,7 @@
         :host            => 'myhost',
         :user            => 'sensuuser',
         :password        => 'sensupass',
-        :vhost           => '/myvhost',
+        :vhost           => 'myvhost',
         :ssl_cert_chain  => '/etc/private/ssl/cert.pem',
         :ssl_private_key => '/etc/private/ssl/key.pem'
       ) }