Merge branch 'develop' into versioning

Author: Rub21

images/web/start.sh

@@ -25,12 +25,14 @@ sed -i -e 's/smtp_authentication: null/smtp_authentication: "login"/g' $workdir/
 sed -i -e 's/smtp_user_name: null/smtp_user_name: "'$MAILER_USERNAME'"/g' $workdir/config/settings.yml
 sed -i -e 's/smtp_password: null/smtp_password: "'$MAILER_PASSWORD'"/g' $workdir/config/settings.yml
 sed -i -e 's/[email protected]/'$MAILER_FROM'/g' $workdir/config/settings.yml
-[[ -z "$MAILER_PORT" ]] && MAILER_PORT=25
 sed -i -e 's/smtp_port: 25/smtp_port: '$MAILER_PORT'/g' $workdir/config/settings.yml
 
 #### SET UP ID KEY
 sed -i -e 's/#id_key: ""/id_key: "'$OSM_id_key'"/g' $workdir/config/settings.yml
 
+## SET NOMINATIM URL
+sed -i -e 's/nominatim.openstreetmap.org/'$NOMINATIM_URL'/g' $workdir/config/settings.yml
+
 #### CHECK IF DB IS ALREADY UP AND START THE APP
 flag=true
 while "$flag" = true; do

osm-seed/templates/web/web-deployment.yaml

@@ -64,7 +64,9 @@ spec:
             - name: MAILER_PASSWORD
               value: {{ quote .Values.web.env.MAILER_PASSWORD }}
             - name: MAILER_FROM
-              value: {{ quote .Values.web.env.MAILER_FROM }}
+              value: {{ .Values.web.env.MAILER_FROM }}
+            - name: MAILER_PORT
+              value: {{ .Values.web.env.MAILER_PORT | default "25" | quote }}
             - name: OSM_id_key
               value: {{ .Values.web.env.OSM_id_key }}
             - name: OSM_memcache_servers

osm-seed/values.yaml

@@ -110,8 +110,10 @@ web:
   env:
     MAILER_ADDRESS: smtp.gmail.com
     MAILER_DOMAIN: gmail.com
-    MAILER_USERNAME: osmseed.test@gmail.com
+    MAILER_USERNAME: example@gmail.com
     MAILER_PASSWORD: '1234'
+    MAILER_FROM: [email protected]
+    MAILER_PORT: 25
     NOMINATIM_URL: 'nominatim'
   resources:
     enabled: false