dev: add missing osm.org web aliases

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 0d6790f46308a675e8383ff304ae180ed2f9816f..f42c22ee3cc4a43d20a7581d965b7a9bbf44637f 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -203,7 +203,7 @@ template "/srv/dev.openstreetmap.org/index.html" do
 end
 
 ssl_certificate "dev.openstreetmap.org" do
-  domains "dev.openstreetmap.org"
+  domains ["dev.openstreetmap.org", "dev.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
@@ -225,7 +225,7 @@ file "/etc/apache2/conf.d/phppgadmin" do
 end
 
 ssl_certificate "phppgadmin.dev.openstreetmap.org" do
-  domains "phppgadmin.dev.openstreetmap.org"
+  domains ["phppgadmin.dev.openstreetmap.org", "phppgadmin.dev.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
@@ -351,7 +351,7 @@ if node[:postgresql][:clusters][:"15/main"]
     gpx_directory = "#{site_directory}/gpx"
 
     if details[:repository]
-      site_aliases = details[:aliases] || []
+      site_aliases = details[:aliases] || ["#{name}.apis.dev.osm.org"]
       secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")
 
       postgresql_database database_name do
@@ -572,7 +572,7 @@ if node[:postgresql][:clusters][:"15/main"]
   end
 
   ssl_certificate "apis.dev.openstreetmap.org" do
-    domains "apis.dev.openstreetmap.org"
+    domains ["apis.dev.openstreetmap.org", "apis.dev.osm.org"]
     notifies :reload, "service[apache2]"
   end
 
@@ -601,7 +601,8 @@ ssl_certificate "ooc.openstreetmap.org" do
   domains ["ooc.openstreetmap.org",
            "a.ooc.openstreetmap.org",
            "b.ooc.openstreetmap.org",
-           "c.ooc.openstreetmap.org"]
+           "c.ooc.openstreetmap.org",
+           "ooc.osm.org"]
   notifies :reload, "service[apache2]"
 end
 

diff --git a/cookbooks/dev/templates/default/apache.apis.erb b/cookbooks/dev/templates/default/apache.apis.erb
index 4d78fdd6aa864e0504ae9172bfc60ff40fff4843..076dae77a2c70dfabb759ec22809e6584fd6e04a 100644 (file)
--- a/cookbooks/dev/templates/default/apache.apis.erb
+++ b/cookbooks/dev/templates/default/apache.apis.erb
@@ -2,6 +2,8 @@
 
 <VirtualHost *:443>
        ServerName apis.dev.openstreetmap.org
+       ServerAlias apis.osm.org
+
        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on
@@ -16,6 +18,8 @@
 
 <VirtualHost *:80>
        ServerName apis.dev.openstreetmap.org
+       ServerAlias apis.osm.org
+
        ServerAdmin webmaster@openstreetmap.org
 
        CustomLog /var/log/apache2/apis.dev.openstreetmap.org-access.log combined_extended

diff --git a/cookbooks/dev/templates/default/apache.dev.erb b/cookbooks/dev/templates/default/apache.dev.erb
index 2d3d9473d27e99858d4d0cb9bf68784db286c68e..2dd13c2b9fb78d355823b138a999c310d07b5d5a 100644 (file)
--- a/cookbooks/dev/templates/default/apache.dev.erb
+++ b/cookbooks/dev/templates/default/apache.dev.erb
@@ -2,6 +2,8 @@
 
 <VirtualHost *:443>
        ServerName dev.openstreetmap.org
+       ServerAlias dev.osm.org
+
        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on
@@ -21,6 +23,8 @@
 
 <VirtualHost *:80>
        ServerName dev.openstreetmap.org
+       ServerAlias dev.osm.org
+
        ServerAdmin webmaster@openstreetmap.org
 
        CustomLog /var/log/apache2/dev.openstreetmap.org-access.log combined_extended

diff --git a/cookbooks/dev/templates/default/apache.ooc.erb b/cookbooks/dev/templates/default/apache.ooc.erb
index 0a9b0b9799484e8cd74dde9d926fecff40c21fc9..a532300e1e801e22c1886e5aa828f6a73eaac39e 100644 (file)
--- a/cookbooks/dev/templates/default/apache.ooc.erb
+++ b/cookbooks/dev/templates/default/apache.ooc.erb
@@ -5,6 +5,8 @@
        ServerAlias a.ooc.openstreetmap.org
        ServerAlias b.ooc.openstreetmap.org
        ServerAlias c.ooc.openstreetmap.org
+       ServerAlias ooc.osm.org
+
        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on
@@ -26,6 +28,8 @@
        ServerAlias a.ooc.openstreetmap.org
        ServerAlias b.ooc.openstreetmap.org
        ServerAlias c.ooc.openstreetmap.org
+       ServerAlias ooc.osm.org
+
        ServerAdmin webmaster@openstreetmap.org
 
        CustomLog /var/log/apache2/ooc.openstreetmap.org-access.log combined_extended
@@ -37,6 +41,8 @@
 
 <VirtualHost *:80>
        ServerName npe.openstreetmap.org
+       ServerAlias npe.osm.org
+
        ServerAdmin webmaster@openstreetmap.org
 
        CustomLog /var/log/apache2/npe.openstreetmap.org-access.log combined_extended

diff --git a/cookbooks/dev/templates/default/apache.phppgadmin.erb b/cookbooks/dev/templates/default/apache.phppgadmin.erb
index 546a05cbee3c45605f9f42cc9620943252c4ec5d..67c37df16420bcea4c2cb794943d818ccb9a6585 100644 (file)
--- a/cookbooks/dev/templates/default/apache.phppgadmin.erb
+++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb
@@ -2,6 +2,8 @@
 
 <VirtualHost *:443>
        ServerName phppgadmin.dev.openstreetmap.org
+       ServerAlias phppgadmin.dev.osm.org
+
        ServerAdmin webmaster@openstreetmap.org
 
        SSLEngine on
@@ -23,6 +25,8 @@
 
 <VirtualHost *:80>
        ServerName phppgadmin.dev.openstreetmap.org
+       ServerAlias phppgadmin.dev.osm.org
+
        ServerAdmin webmaster@openstreetmap.org
 
        CustomLog /var/log/apache2/phppgadmin.dev.openstreetmap.org-access.log combined_extended

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
 

diff --git a/roles/dev.rb b/roles/dev.rb
index a3e67e0f0bb112d1370941aabe8bf12d0ddd05d2..56989abbc0df15e02956c5a6c2cd9ff5a21fdece 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -116,7 +116,7 @@ default_attributes(
         :revision => "master",
         :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
         :cgimap_revision => "master",
-        :aliases => ["api06.dev.openstreetmap.org"]
+        :aliases => ["master.dev.osm.org","api06.dev.openstreetmap.org", "api06.dev.osm.org"]
       },
       :tomh => {
         :repository => "https://github.com/tomhughes/openstreetmap-website.git",