Add ulr path to download files

Update taginfo scrpit

Fix scrpit

Fix config for taginfo serviceAccount

Author: Rub21

envs/.env.taginfo.example

@@ -12,4 +12,5 @@ INSTANCE_ICON=https://www.openhistoricalmap.org/assets/ohm_logo-2d97749faddd5bd0
 INSTANCE_CONTACT= "Anonymous"
 TAGINFO_PROJECT_REPO=https://github.com/OpenHistoricalMap/taginfo-projects.git
 DOWNLOAD_DB='languages wiki'
-CREATE_DB='db projects chronology'
+CREATE_DB='db projects chronology'
+TAGINFO_DB_BASE_URL=https://planet.openhistoricalmap.org.s3.amazonaws.com/taginfo

images/taginfo/start.sh

@@ -46,12 +46,8 @@ process_data() {
     # wikidata/update.sh $DATADIR
     chronology/update.sh $DATADIR
     ./update_all.sh $DATADIR
-    mv $DATADIR/*.db $DATADIR/
-    mv $DATADIR/*/*.db $DATADIR/
-    # if AWS_S3_BUCKET is set upload data
-    if ! aws s3 ls "s3://$AWS_S3_BUCKET/taginfo/$ENVIRONMENT" 2>&1 | grep -q 'An error occurred'; then
-        aws s3 sync $DATADIR/ s3://$AWS_S3_BUCKET/taginfo/$ENVIRONMENT/  --exclude "*" --include "*.db"
-    fi
+    # Move database files from subdirectories to main data directory
+    aws s3 sync $DATADIR/ s3://$AWS_S3_BUCKET/taginfo/$ENVIRONMENT/  --exclude "*" --include "*.db"
 }
 
 # Compress files to download
@@ -63,24 +59,60 @@ compress_files() {
 }
 
 download_db_files() {
-    if ! aws s3 ls "s3://$AWS_S3_BUCKET/$ENVIRONMENT" 2>&1 | grep -q 'An error occurred'; then
-        aws s3 sync "s3://$AWS_S3_BUCKET/$ENVIRONMENT/" "$DATADIR/"
-        mv $DATADIR/*.db $DATADIR/
-        mv $DATADIR/*/*.db $DATADIR/
-        compress_files
+    local base_url=$1
+    
+    if [ -z "$base_url" ]; then
+        echo "Error: URL base is required for download_db_files"
+        return 1
+    fi
+    
+    # Ensure base_url ends with /
+    if [[ ! "$base_url" =~ /$ ]]; then
+        base_url="${base_url}/"
     fi
+    
+    # List of SQLite database files to download
+    local db_files=(
+        "projects-cache.db"
+        "selection.db"
+        "taginfo-chronology.db"
+        "taginfo-db.db"
+        "taginfo-history.db"
+        "taginfo-languages.db"
+        "taginfo-master.db"
+        "taginfo-projects.db"
+        "taginfo-wiki.db"
+        "taginfo-wikidata.db"
+    )
+    
+    echo "Downloading SQLite database files from: $base_url"
+    
+    for db_file in "${db_files[@]}"; do
+        local file_url="${base_url}${db_file}"
+        local output_path="${DATADIR}/${db_file}"
+        
+        echo "Downloading: $db_file"
+        if wget -q --show-progress -O "$output_path" --no-check-certificate "$file_url"; then
+            echo "Successfully downloaded: $db_file"
+        else
+            echo "Warning: Failed to download $db_file from $file_url"
+            # Continue with other files even if one fails
+        fi
+    done
+    
+    echo "Database files download completed"
 }
 
 sync_latest_db_version() {
     while true; do
         sleep "$INTERVAL_DOWNLOAD_DATA"
-        download_db_files
+        download_db_files "$TAGINFO_DB_BASE_URL"
     done
 }
 
 start_web() {
     echo "Start...Taginfo web service"
-    download_db_files
+    download_db_files "$TAGINFO_DB_BASE_URL"
     cd $WORKDIR/taginfo/web && ./taginfo.rb & sync_latest_db_version
 }
 

osm-seed/templates/taginfo/taginfo-configMap.yaml

@@ -15,5 +15,6 @@ data:
     TIME_UPDATE_INTERVAL: {{ .Values.taginfo.env.TIME_UPDATE_INTERVAL | quote }}
     AWS_S3_BUCKET: {{ .Values.taginfo.env.AWS_S3_BUCKET | quote }}
     ENVIRONMENT: {{ .Values.taginfo.env.ENVIRONMENT | quote }}
-    INTERVAL_DOWNLOAD_DATA: {{ .Values.taginfo.env.INTERVAL_DOWNLOAD_DATA | quote}}
+    INTERVAL_DOWNLOAD_DATA: {{ .Values.taginfo.env.INTERVAL_DOWNLOAD_DATA | quote }}
+    TAGINFO_DB_BASE_URL: {{ .Values.taginfo.env.TAGINFO_DB_BASE_URL | quote }}
 {{- end }}

osm-seed/templates/taginfo/taginfo-cronJob.yaml

@@ -19,7 +19,10 @@ spec:
     spec:
       template:
         spec:
+          {{- if .Values.taginfo.serviceAccount.enabled }}
           serviceAccountName: {{ .Values.taginfo.serviceAccount.name }}
+          automountServiceAccountToken: true
+          {{- end }}
           containers:
           - name: {{ .Release.Name }}-taginfo-job
             image: "{{ .Values.taginfo.image.name }}:{{ .Values.taginfo.image.tag }}"

osm-seed/values.yaml

@@ -1030,6 +1030,7 @@ taginfo:
     ENVIRONMENT: development
     AWS_S3_BUCKET: taginfo
     INTERVAL_DOWNLOAD_DATA: 3600
+    TAGINFO_DB_BASE_URL: https://planet.openhistoricalmap.org.s3.amazonaws.com/taginfo
   resources:
     enabled: false
     requests: