Drop php-mcrypt

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

diff --git a/cookbooks/blogs/templates/default/apache.erb b/cookbooks/blogs/templates/default/apache.erb
index 3995ad547a7425da941dd750b9d2f36fd3467306..7986de43060fade4e3634c621af096325c86bf30 100644 (file)
--- a/cookbooks/blogs/templates/default/apache.erb
+++ b/cookbooks/blogs/templates/default/apache.erb
@@ -7,6 +7,7 @@
    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
 

+   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/

    Redirect permanent / https://<%= @name %>/
 </VirtualHost>
 
    Redirect permanent / https://<%= @name %>/
 </VirtualHost>
 


@@ -18,9 +19,10 @@
    ErrorLog /var/log/apache2/<%= @name %>-error.log
 
    DocumentRoot <%= @directory %>
    ErrorLog /var/log/apache2/<%= @name %>-error.log
 
    DocumentRoot <%= @directory %>

-   DirectoryIndex planet.html

 
    SSLEngine on
 
    SSLEngine on

+   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key

 </VirtualHost>
 
 <Directory <%= @directory %>>
 </VirtualHost>
 
 <Directory <%= @directory %>>