Add script to overwrite config in taginfo

Author: Rub21

.env-taginfo.example

@@ -9,5 +9,5 @@ INSTANCE_DESCRIPTION="This is a <b>taginfo test instance</b>. Change this text i
 INSTANCE_ICON=/img/logo/world.png
 INSTANCE_CONTACT=Anonymous
 TAGINFO_PROJECT_REPO=https://github.com/taginfo/taginfo-projects.git
-DOWNLOAD_DB=languages wiki
-CREATE_DB=db projects chronology
+DOWNLOAD_DB='languages wiki'
+CREATE_DB='db projects chronology'

images/taginfo/Dockerfile

@@ -10,6 +10,7 @@ RUN apt-get update && apt-get -y install \
     libapache2-mod-passenger \
     git
 
+# Commit ae5a950f7aa4c0de4e706839619a1dc05fc4450a, at 2021-10-18
 RUN git clone https://github.com/taginfo/taginfo.git $workdir/taginfo
 WORKDIR $workdir/taginfo
 RUN echo "gem 'thin' " >>Gemfile
@@ -46,6 +47,8 @@ RUN git submodule update --init
 RUN  mkdir build && cd build && cmake .. && make
 
 RUN apt-get install -y nano vim
+COPY overwrite_config.py $workdir/
 COPY start.sh $workdir/
+
 WORKDIR $workdir/
 CMD $workdir/start.sh

images/taginfo/README.md

@@ -16,12 +16,7 @@ All environment variables are located at [`.env-taginfo.example`](https://github
 
 The following env vars are required in the instance to update the values at: https://github.com/taginfo/taginfo/blob/master/taginfo-config-example.json
 
-- `INSTANCE_URL`: URL prefix for the site.
-- `INSTANCE_NAME`: Used in the title of all HTML pages.
-- `INSTANCE_DESCRIPTION` : Description of this taginfo instance. Will appear on the home page and about page.
-- `INSTANCE_ICON`: URL path to instance icon in the upper left.
-- `INSTANCE_CONTACT`: Contact name and email address.
-- `TAGINFO_PROJECT_REPO` : If you're implementing your own instances of taginfo with you own data, you need to look into the projects, clone the [taginfo-project ](https://github.com/taginfo/taginfo-projects) repo, and pass it in this env var.
+- `OVERWRITE_CONFIG_URL`: config file with the values to update
 
 - `DOWNLOAD_DB`: Taginfo instances need 7 Sqlite databases to start up the web service, all of them can be downloaded from https://taginfo.openstreetmap.org/download. Or if you can download only some of them you can pass herec. e.g DOWNLOAD_DB=`languages wiki`, or DOWNLOAD_DB=`languages wiki projects chronology`.
 

images/taginfo/overwrite_config.py

@@ -0,0 +1,45 @@
+""" Script to overwrite values in set config
+    python3 overwrite_config.py \
+    -u https://gist.githubusercontent.com/Rub21/1a82fb3e4c0efd15524709a5e2d8ab89/raw/23c399802ba2a01cc30379875ac02a7b1b5ac8e1/taginfo.json\
+    -f taginfo-config.json
+"""
+
+import argparse
+import urllib.request
+import json
+
+def main(config_file, overwrite_config_url):
+    with urllib.request.urlopen(overwrite_config_url) as url:
+        overwrite_values = json.loads(url.read())
+    with open(config_file) as f:
+        current_values = json.loads(f.read())
+    # Hardcode for certain values
+    if 'instance' in overwrite_values.keys():
+        current_values['instance'] = overwrite_values['instance']
+    if 'turbo' in overwrite_values.keys():
+        current_values['turbo'] = overwrite_values['turbo']
+    if 'sources' in overwrite_values.keys() and 'master' in overwrite_values['sources'].keys():
+        current_values['sources']['master'] = overwrite_values['sources']['master']
+    # Overwrite file
+    with open(config_file + '.json', 'w') as f:
+        f.write(json.dumps(current_values))
+
+
+parser = argparse.ArgumentParser(description='Set config values')
+parser.add_argument(
+    '-u',
+    type=str,
+    help='URL of the config to overwrite',
+    dest='overwrite_config_url')
+
+parser.add_argument(
+    '-f'
+    '--config_file',
+    type=str,
+    help='Path of the config file',
+    dest='config_file')
+
+args = parser.parse_args()
+
+if args.config_file and args.overwrite_config_url:
+    main(args.config_file, args.overwrite_config_url)

images/taginfo/start.sh

@@ -17,14 +17,13 @@ set_taginfo_config() {
         jq '.sources.db.bindir                   = "'$UPDATE_DIR'/build/src"' |
         jq '.paths.data_dir                      = "'$DATA_DIR'"' \
             >$WORKDIR/taginfo-config.json
-    # Update instance values in taginfo-config.json
-    [[ ! -z ${INSTANCE_URL+z} ]] && jq --arg a "${INSTANCE_URL}" '.instance.url = $a' $WORKDIR/taginfo-config.json >tmp.json && mv tmp.json $WORKDIR/taginfo-config.json
-    [[ ! -z $INSTANCE_NAME+z} ]] && jq --arg a "${INSTANCE_NAME}" '.instance.name = $a' $WORKDIR/taginfo-config.json >tmp.json && mv tmp.json $WORKDIR/taginfo-config.json
-    [[ ! -z $INSTANCE_DESCRIPTION+z} ]] && jq --arg a "${INSTANCE_DESCRIPTION}" '.instance.description = $a' $WORKDIR/taginfo-config.json >tmp.json && mv tmp.json $WORKDIR/taginfo-config.json
-    [[ ! -z $INSTANCE_ICON+z} ]] && jq --arg a "${INSTANCE_ICON}" '.instance.icon = $a' $WORKDIR/taginfo-config.json >tmp.json && mv tmp.json $WORKDIR/taginfo-config.json
-    [[ ! -z $INSTANCE_CONTACT+z} ]] && jq --arg a "${INSTANCE_CONTACT}" '.instance.contact = $a' $WORKDIR/taginfo-config.json >tmp.json && mv tmp.json $WORKDIR/taginfo-config.json
+    
     # languages wiki databases will be downloaded from OSM
     [[ ! -z $DOWNLOAD_DB+z} ]] && jq --arg a "${DOWNLOAD_DB}" '.sources.download = $a' $WORKDIR/taginfo-config.json >tmp.json && mv tmp.json $WORKDIR/taginfo-config.json
+
+    # Update instance values in taginfo-config.json
+    python3 overwrite_config.py -u $OVERWRITE_CONFIG_URL -f $WORKDIR/taginfo-config.json
+
 }
 
 updates_create_db() {

osm-seed/templates/taginfo-deployment.yaml

@@ -53,16 +53,8 @@ spec:
               value: {{ .Values.taginfo.env.URL_HISTORY_PLANET_FILE_STATE }}
             - name: URL_HISTORY_PLANET_FILE
               value: {{ .Values.taginfo.env.URL_HISTORY_PLANET_FILE }}
-            - name: INSTANCE_URL
-              value: dns
-            - name: INSTANCE_NAME
-              value: {{ .Values.taginfo.env.INSTANCE_NAME }}
-            - name: INSTANCE_DESCRIPTION
-              value: {{ .Values.taginfo.env.INSTANCE_DESCRIPTION }}
-            - name: INSTANCE_ICON
-              value: {{ .Values.taginfo.env.INSTANCE_ICON }}
-            - name: INSTANCE_CONTACT
-              value: {{ .Values.taginfo.env.INSTANCE_CONTACT }}
+            - name: OVERWRITE_CONFIG_URL
+              value: {{ .Values.taginfo.env.OVERWRITE_CONFIG_URL }}
             - name: TAGINFO_PROJECT_REPO
               value: {{ .Values.taginfo.env.TAGINFO_PROJECT_REPO }}
             - name: DOWNLOAD_DB