X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1d07e74a1f0c16c2cfc3d5cac0eb6930d6d84bc1..57ee30ffe5e6106f3cbd9a91c1599eb5b51e8c36:/cookbooks/mediawiki/templates/default/apache.erb

diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb
index 0e173841c..a4e0e48a4 100644
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/templates/default/apache.erb
@@ -1,7 +1,6 @@
 # DO NOT EDIT - This file is being maintained by Chef
-<% @ports.each do |port| -%>
 
-<VirtualHost *:<%= port %>>
+<VirtualHost *:80>
   ServerName <%= @name %>
 <% @aliases.each do |alias_name| -%>
   ServerAlias <%= alias_name %>
@@ -9,24 +8,30 @@
 
   ServerAdmin webmaster@openstreetmap.org
 
-<% if port == 443 -%>
+  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>
+
+<VirtualHost *:443>
+  ServerName <%= @name %>
+<% @aliases.each do |alias_name| -%>
+  ServerAlias <%= alias_name %>
+
+  ServerAdmin webmaster@openstreetmap.org
+
   SSLEngine on
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
   CustomLog /var/log/apache2/<%= @name %>-secure-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-secure-error.log
-<% else -%>
-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
-  ErrorLog /var/log/apache2/<%= @name %>-error.log
 <% end -%>
 
   DocumentRoot <%= @directory %>
 
-<% if @ssl_enabled -%>
-  RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-<% end -%>
-
   php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/
   #php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open"
   php_value memory_limit 128M
@@ -35,11 +40,7 @@
   php_value post_max_size 100M
 
   RewriteCond %{SERVER_NAME} !=<%= @name %>
-<% if port == 443 -%>
   RewriteRule ^/(.*)$ https://<%= @name %>/$1 [R=permanent]
-<% else -%>
-  RewriteRule ^/(.*)$ http://<%= @name %>/$1 [R=permanent]
-<% end -%>
 
   RedirectMatch 301 ^/$                           /wiki/Main_Page
 
@@ -131,4 +132,3 @@
     Require all denied
   </Files>
 </VirtualHost>
-<% end -%>