Merge https://github.com/AKQABER/chef-kibana into apache_template

lusis · Oct 22, 2013 · abbed9e · abbed9e
2 parents 71393a9 + 9ae8973
commit abbed9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/attributes/apache.rb b/attributes/apache.rb
@@ -1,2 +1,3 @@
 default['kibana']['apache']['template'] = 'kibana-apache.conf.erb'
+default['kibana']['apache']['template_cookbook'] = 'kibana'
 default['kibana']['apache']['enable_default_site'] = false
diff --git a/recipes/apache.rb b/recipes/apache.rb
@@ -26,9 +26,8 @@
 include_recipe "apache2::mod_proxy_http"
 
 web_app "#{node['kibana']['webserver_hostname']}-#{node['kibana']['webserver_port']}" do
-  cookbook       "kibana"
+  cookbook       node['kibana']['apache']['template_cookbook']
   docroot        node['kibana']['installdir']
-  server_name    node['kibana']['webserver_hostname']
   template       node['kibana']['apache']['template']
   es_server      node['kibana']['es_server']
   es_port        node['kibana']['es_port']