PassengerUseGlobalQueue defaults to on with passenger 4

[chef.git] / cookbooks / wordpress / templates / default / apache.erb

diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index 90adc23a29c6ae908af45fdb3a9b36d3ed3aed28..997b44322cb6a3b9874dd8c8576dbad957b1eba0 100644 (file)
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -11,25 +11,25 @@
   CustomLog /var/log/apache2/<%= @name %>-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
-
 <% if @ssl_enabled -%>
-    RedirectPermanent / https://<%= @name %>/
-  </VirtualHost>
-  <VirtualHost *:443>
-    ServerName <%= @name %>
-  <% @aliases.each do |alias_name| -%>
-    ServerAlias <%= alias_name %>
-  <% end -%>
-
-    ServerAdmin webmaster@openstreetmap.org
-
-    #
-    # Enable SSL
-    #
-    SSLEngine on
-
-    CustomLog /var/log/apache2/<%= @name %>-access.log combined
-    ErrorLog /var/log/apache2/<%= @name %>-error.log
+  RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+
+<VirtualHost *:443>
+  ServerName <%= @name %>
+<% @aliases.each do |alias_name| -%>
+  ServerAlias <%= alias_name %>
+<% end -%>
+
+  ServerAdmin webmaster@openstreetmap.org
+
+  #
+  # Enable SSL
+  #
+  SSLEngine on
+
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
 <% end -%>
 
   DocumentRoot <%= @directory %>