Pass vtiles subdomain to the web container

Author: Rub21

images/web/start.sh

@@ -130,11 +130,14 @@ setup_production() {
 
   # Update map styles. This line should be removed later, as the configuration should come from the module.
   SERVER_URL_="${SERVER_URL/www./}"
+  # Tiler host. Defaults to vtiles.<server domain>; override VTILES_DOMAIN to use a
+  # shared tiler (e.g. a preview that has no tiler of its own).
+  VTILES_DOMAIN="${VTILES_DOMAIN:-vtiles.${SERVER_URL_}}"
   find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|openhistoricalmap.github.io|${SERVER_URL}|g" {} +
   find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|http://localhost:8888|https://${SERVER_URL}/map-styles|g" {} +
   find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|www.openhistoricalmap.org|${SERVER_URL}|g" {} +
-  find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|vtiles.openhistoricalmap.org|vtiles.${SERVER_URL_}|g" {} +
-  find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|vtiles.staging.openhistoricalmap.org|vtiles.${SERVER_URL_}|g" {} +
+  find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|vtiles.openhistoricalmap.org|${VTILES_DOMAIN}|g" {} +
+  find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|vtiles.staging.openhistoricalmap.org|${VTILES_DOMAIN}|g" {} +
 
   # Replace URLs in the public directory
   find "/var/www/public" -type f \( \
@@ -152,8 +155,8 @@ setup_production() {
       -e "s|openhistoricalmap.github.io|${SERVER_URL}|g" \
       -e "s|http://localhost:8888|https://${SERVER_URL}/map-styles|g" \
       -e "s|www.openhistoricalmap.org|${SERVER_URL}|g" \
-      -e "s|vtiles.openhistoricalmap.org|vtiles.${SERVER_URL_}|g" \
-      -e "s|vtiles.staging.openhistoricalmap.org|vtiles.${SERVER_URL_}|g" \
+      -e "s|vtiles.openhistoricalmap.org|${VTILES_DOMAIN}|g" \
+      -e "s|vtiles.staging.openhistoricalmap.org|${VTILES_DOMAIN}|g" \
       "$file"
   done
 

values.k3s.preview.template.yaml

@@ -31,6 +31,8 @@ osm-seed:
       MAILER_FROM: web@noreply.openhistoricalmap.org
       NOMINATIM_URL: nominatim.openhistoricalmap.org
       OVERPASS_URL: overpass-api.openhistoricalmap.org
+      VTILES_DOMAIN: vtiles.openhistoricalmap.org
+
       NEW_RELIC_LICENSE_KEY: "none"
       NEW_RELIC_APP_NAME: "none"
       ORGANIZATION_NAME: OpenHistoricalMap
@@ -39,7 +41,6 @@ osm-seed:
       RAILS_MASTER_KEY: "ceadf340a26657419e5343d46b60798c"
       RAILS_ENV: production
       RAILS_LOG_LEVEL: debug
-
       OPENSTREETMAP_id_key: "tCygIMWpJVZ2c-vWYC_kI_YnMow3WmGbKLp2Rq_WgHI"
       OAUTH_CLIENT_ID: "Zj5OnOQLXJKgGYFMwsisuhsHR-FAg1khf-wr0nE3OWo"
       OAUTH_KEY: "OGNWJkSOmeJ8X08iL6Srv0oTaETIcwftD5OyFPbbY3A"

values.production.template.yaml

@@ -131,6 +131,8 @@ osm-seed:
       MAILER_FROM: web@noreply.penhistoricalmap.org
       NOMINATIM_URL: nominatim.openhistoricalmap.org
       OVERPASS_URL: overpass-api.openhistoricalmap.org
+      VTILES_DOMAIN: vtiles.openhistoricalmap.org
+
       NEW_RELIC_LICENSE_KEY: 'none'
       NEW_RELIC_APP_NAME: 'none'
       ORGANIZATION_NAME: OpenHistoricalMap

values.staging.template.yaml

@@ -133,6 +133,8 @@ osm-seed:
         MAILER_FROM: web@noreply.openhistoricalmap.org
         NOMINATIM_URL: nominatim.ohmstaging.org
         OVERPASS_URL: overpass-api.ohmstaging.org	
+        VTILES_DOMAIN: vtiles.ohmstaging.org
+
         NEW_RELIC_LICENSE_KEY: "none"
         NEW_RELIC_APP_NAME: "none"
         ORGANIZATION_NAME: OpenHistoricalMap