Use consistent ordering in apache configuration

diff --git a/cookbooks/foundation/templates/default/apache.welcome.erb b/cookbooks/foundation/templates/default/apache.welcome.erb
index 58652608593f5d052cbfe43c0c281f93fd824131..55dc39c18b1f37a6cb9448932af0b2bf18bc13ec 100644 (file)
--- a/cookbooks/foundation/templates/default/apache.welcome.erb
+++ b/cookbooks/foundation/templates/default/apache.welcome.erb
@@ -13,8 +13,8 @@
   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>

-

 <% unless @aliases.empty? -%>
 <% unless @aliases.empty? -%>

+

 <VirtualHost *:443>
   ServerName <%= @aliases.first %>
 <% @aliases.drop(1).each do |alias_name| -%>
 <VirtualHost *:443>
   ServerName <%= @aliases.first %>
 <% @aliases.drop(1).each do |alias_name| -%>


@@ -22,13 +22,13 @@
 <% end -%>
   ServerAdmin webmaster@openstreetmap.org
 
 <% end -%>
   ServerAdmin webmaster@openstreetmap.org
 

+  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
+

   SSLEngine on
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
   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
-

   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
 <% end -%>
   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
 <% end -%>


@@ -44,7 +44,6 @@
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 

-  # Let the backend know we are using HTTPS

   RequestHeader set X-Forwarded-Proto "https"
   RequestHeader set X-Forwarded-Port "443"
 
   RequestHeader set X-Forwarded-Proto "https"
   RequestHeader set X-Forwarded-Port "443"
 

diff --git a/cookbooks/stateofthemap/templates/default/apache.jekyll.erb b/cookbooks/stateofthemap/templates/default/apache.jekyll.erb
index 58652608593f5d052cbfe43c0c281f93fd824131..55dc39c18b1f37a6cb9448932af0b2bf18bc13ec 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/apache.jekyll.erb
+++ b/cookbooks/stateofthemap/templates/default/apache.jekyll.erb
@@ -13,8 +13,8 @@
   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>

-

 <% unless @aliases.empty? -%>
 <% unless @aliases.empty? -%>

+

 <VirtualHost *:443>
   ServerName <%= @aliases.first %>
 <% @aliases.drop(1).each do |alias_name| -%>
 <VirtualHost *:443>
   ServerName <%= @aliases.first %>
 <% @aliases.drop(1).each do |alias_name| -%>


@@ -22,13 +22,13 @@
 <% end -%>
   ServerAdmin webmaster@openstreetmap.org
 
 <% end -%>
   ServerAdmin webmaster@openstreetmap.org
 

+  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
+

   SSLEngine on
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
   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
-

   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
 <% end -%>
   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
 <% end -%>


@@ -44,7 +44,6 @@
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
   SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
   SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 

-  # Let the backend know we are using HTTPS

   RequestHeader set X-Forwarded-Proto "https"
   RequestHeader set X-Forwarded-Port "443"
 
   RequestHeader set X-Forwarded-Proto "https"
   RequestHeader set X-Forwarded-Port "443"