Merge branch 'develop' into update/docs_envs

Author: Rub21

images/nominatim/Dockerfile

@@ -142,6 +142,7 @@ COPY startapache.sh /app/startapache.sh
 COPY startpostgres.sh /app/startpostgres.sh
 COPY update.sh /app/update.sh
 COPY start.sh /app/start.sh
+COPY replace_domain.sh /app/replace_domain.sh
 
 # Collapse image to single layer.
 FROM scratch

images/nominatim/replace_domain.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# Replace API URLs on files
+sed -i -e "s/www.openstreetmap.org/$OSMSEED_WEB_API_DOMAIN/g" /app/src/lib/lib.php
+sed -i -e "s/www.openstreetmap.org/$OSMSEED_WEB_API_DOMAIN/g" /app/src/utils/update.php
+sed -i -e "s/overpass-api.de/$OSMSEED_OVERPASS_API_DOMAIN/g" /app/src/utils/update.php

images/nominatim/start.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Replace domains
+./replace_domain.sh
+
 echo 'Starting init...'
 sh /app/init.sh
 echo 'Starting database and updates...'

images/nominatim/startapache.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
 export NOMINATIM_SETTINGS='/app/src/build/settings/local_api.php'
-
 # echo 'Setup the app'
 # /app/src/build/utils/setup.php --setup-website
 
+# Replace domains
+./replace_domain.sh
+
 flag=true
 while "$flag" = true; do
     pg_isready -h $PG_HOST -p $PG_PORT >/dev/null 2>&2 || continue

osm-seed/templates/nominatim-api-deployment.yaml

@@ -59,6 +59,10 @@ spec:
               value: {{ .Values.nominatimDb.env.PG_USER }}
             - name: PG_PORT
               value: {{ .Values.nominatimDb.env.PG_PORT  | quote }}
+            - name: OSMSEED_WEB_API_DOMAIN
+              value: {{ .Values.nominatimApi.env.OSMSEED_WEB_API_DOMAIN }}
+            - name: OSMSEED_OVERPASS_API_DOMAIN
+              value: {{ .Values.nominatimApi.env.OSMSEED_OVERPASS_API_DOMAIN }}
       {{- if .Values.nominatimApi.nodeSelector.enabled }}
       nodeSelector:
         {{ .Values.nominatimApi.nodeSelector.label_key }} : {{ .Values.nominatimApi.nodeSelector.label_value }}

osm-seed/templates/nominatim-db-statefulset.yaml

@@ -59,6 +59,10 @@ spec:
               value: {{ .Values.nominatimDb.persistenceDisk.mountPath }}
             - name: POD_IP
               valueFrom: { fieldRef: { fieldPath: status.podIP } }
+            - name: OSMSEED_WEB_API_DOMAIN
+              value: {{ .Values.nominatimApi.env.OSMSEED_WEB_API_DOMAIN }}
+            - name: OSMSEED_OVERPASS_API_DOMAIN
+              value: {{ .Values.nominatimApi.env.OSMSEED_OVERPASS_API_DOMAIN }}
           command: ["/bin/sh"]
           args: ["-c", "sh /app/start.sh"]
           # livenessProbe:

osm-seed/values.yaml

@@ -528,7 +528,9 @@ nominatimApi:
   enabled: true
   replicaCount: 1
   env:
-    BASE_URL: 'https://nominatim.osm-seed.test'
+    BASE_URL: https://nominatim.osm-seed.test
+    OSMSEED_WEB_API_DOMAIN: osmseed.org
+    OSMSEED_OVERPASS_API_DOMAIN: overpass-api.osmseed.org
   resources:
     enabled: false
     requests: