dev: add missing osm.org web aliases

[chef.git] / cookbooks / dev / templates / default / apache.user.erb

diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb
index 373d12258faef19fd427c44d5d66f331092e54ad..0c51e44e04d5ae495670549acc29c60ebc5d989a 100644 (file)
--- a/cookbooks/dev/templates/default/apache.user.erb
+++ b/cookbooks/dev/templates/default/apache.user.erb
@@ -4,9 +4,10 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> processes
 
 <VirtualHost *:443>
        ServerName <%= @user %>.dev.openstreetmap.org
-       ServerAdmin webmaster@openstreetmap.org
        ServerAlias <%= @user %>.dev.osm.org
 
+       ServerAdmin webmaster@openstreetmap.org
+
        SSLEngine on
        SSLCertificateFile /etc/ssl/certs/<%= @user %>.dev.openstreetmap.org.pem
        SSLCertificateKeyFile /etc/ssl/private/<%= @user %>.dev.openstreetmap.org.key
@@ -36,9 +37,10 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> processes
 
 <VirtualHost *:80>
        ServerName <%= @user %>.dev.openstreetmap.org
-       ServerAdmin webmaster@openstreetmap.org
        ServerAlias <%= @user %>.dev.osm.org
 
+       ServerAdmin webmaster@openstreetmap.org
+
        CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined_extended
        ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log