Do not configure HTTPS virtual host, if ssl port == -1

bflad · Feb 2, 2015 · 48fa086 · 48fa086
1 parent 0d3eb79
commit 48fa086
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/recipes/apache2.rb b/recipes/apache2.rb
@@ -1,5 +1,7 @@
 node.set['apache']['listen_ports'] = node['apache']['listen_ports'] + [node['stash']['apache2']['port']] unless node['apache']['listen_ports'].include?(node['stash']['apache2']['port'])
-node.set['apache']['listen_ports'] = node['apache']['listen_ports'] + [node['stash']['apache2']['ssl']['port']] unless node['apache']['listen_ports'].include?(node['stash']['apache2']['ssl']['port'])
+unless node['apache']['listen_ports'].include?(node['stash']['apache2']['ssl']['port']) || node['stash']['apache2']['ssl']['port'] == -1
+  node.set['apache']['listen_ports'] = node['apache']['listen_ports'] + [node['stash']['apache2']['ssl']['port']]
+end
 
 include_recipe 'apache2'
 include_recipe 'apache2::mod_proxy'

diff --git a/templates/default/web_app.conf.erb b/templates/default/web_app.conf.erb
@@ -30,6 +30,7 @@
 	ProxyPassReverse / http://localhost:<%= node['stash']['tomcat']['port'] %>/
 </VirtualHost>
 
+<%- unless node['stash']['apache2']['ssl']['port'] == -1 %>
 <VirtualHost *:<%= node['stash']['apache2']['ssl']['port'] %>>
 	<% unless node['stash']['apache2']['virtual_host_name'].empty? -%>
 	ServerName <%= node['stash']['apache2']['virtual_host_name'] %>
@@ -64,3 +65,4 @@
 	SSLCertificateChainFile <%= node['stash']['apache2']['ssl']['chain_file'] %>
 	<% end -%>
 </VirtualHost>
+<% end -%>