Sort certificates in a stable order

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

diff --git a/cookbooks/cgiirc/templates/default/apache.erb b/cookbooks/cgiirc/templates/default/apache.erb
index ea6ada67bf9e73d14b16b4d7deb485dc05104556..780e54784d79cf71d6576e1f057112b7c152d7f4 100644 (file)
--- a/cookbooks/cgiirc/templates/default/apache.erb
+++ b/cookbooks/cgiirc/templates/default/apache.erb
@@ -1,9 +1,13 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-<VirtualHost *:80>
+<VirtualHost *:443>

        ServerName <%= @name %>
        ServerAdmin webmaster@openstreetmap.org
 
        ServerName <%= @name %>
        ServerAdmin webmaster@openstreetmap.org
 

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

        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
 


@@ -13,6 +17,11 @@
 
        <Directory "/usr/lib/cgi-bin/cgiirc">
                AddHandler cgi-script .cgi
 
        <Directory "/usr/lib/cgi-bin/cgiirc">
                AddHandler cgi-script .cgi

+               Require all granted
+       </Directory>
+
+       <Directory "/usr/share/images/cgiirc">
+               Require all granted

        </Directory>
 
        <IfModule mod_deflate.c>
        </Directory>
 
        <IfModule mod_deflate.c>


@@ -20,3 +29,14 @@
                SetEnv no-gzip
        </IfModule>
 </VirtualHost>
                SetEnv no-gzip
        </IfModule>
 </VirtualHost>

+
+<VirtualHost *:80>
+       ServerName <%= @name %>
+       ServerAdmin webmaster@openstreetmap.org
+
+       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/
+       RedirectPermanent / https://<%= @name %>/
+</VirtualHost>