Teach wordpress cookbook about SSL. Enabled on blog

[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 1af8f3bb32d0732d3bc13b304b76abf4e82b9e92..90adc23a29c6ae908af45fdb3a9b36d3ed3aed28 100644 (file)
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -11,6 +11,27 @@
   CustomLog /var/log/apache2/<%= @name %>-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-error.log
 
   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
+<% end -%>
+

   DocumentRoot <%= @directory %>
 <% @urls.each do |url,directory| -%>
   Alias <%= url %> <%= directory %>
   DocumentRoot <%= @directory %>
 <% @urls.each do |url,directory| -%>
   Alias <%= url %> <%= directory %>