Update taginfo

Author: Rub21

envs/.env.taginfo.example

@@ -16,3 +16,4 @@ CREATE_DB='db projects chronology'
 TAGINFO_DB_BASE_URL=https://planet.openhistoricalmap.org.s3.amazonaws.com/taginfo
 AWS_S3_BUCKET=planet-staging.openhistoricalmap.org
 ENVIRONMENT=staging
+FETCH_DB_FILES=true

images/taginfo/start.sh

@@ -46,15 +46,12 @@ process_data() {
     # wikidata/update.sh $DATADIR
     chronology/update.sh $DATADIR
     ./update_all.sh $DATADIR
-    # Create results directory and copy all .db files from subdirectories and main directory
-    RESULTS_DIR="$DATADIR/results"
-    mkdir -p "$RESULTS_DIR"
-    # Copy all .db files from subdirectories to results
-    find $DATADIR -mindepth 2 -name "*.db" -type f -exec cp {} "$RESULTS_DIR/" \; 2>/dev/null || true
-    # Copy .db files from main directory to results
-    find $DATADIR -maxdepth 1 -name "*.db" -type f -exec cp {} "$RESULTS_DIR/" \; 2>/dev/null || true
-    # Sync results directory to S3 bucket
-    aws s3 sync "$RESULTS_DIR/" "s3://$AWS_S3_BUCKET/taginfo/$ENVIRONMENT/" --exclude "*" --include "*.db"
+    mv $DATADIR/*.db $DATADIR/
+    mv $DATADIR/*/*.db $DATADIR/
+    # if AWS_S3_BUCKET is set upload data
+    if ! aws s3 ls "s3://$AWS_S3_BUCKET/$ENVIRONMENT" 2>&1 | grep -q 'An error occurred'; then
+        aws s3 sync $DATADIR/ s3://$AWS_S3_BUCKET/$ENVIRONMENT/  --exclude "*" --include "*.db"
+    fi
 }
 
 # Compress files to download
@@ -119,8 +116,13 @@ sync_latest_db_version() {
 
 start_web() {
     echo "Start...Taginfo web service"
-    download_db_files "$TAGINFO_DB_BASE_URL"
-    cd $WORKDIR/taginfo/web && ./taginfo.rb & sync_latest_db_version
+    # FETCH_DB_FILES defaults to true if not set
+    FETCH_DB_FILES=${FETCH_DB_FILES:-true}
+    if [ "${FETCH_DB_FILES}" = "true" ]; then
+        echo "Downloading initial database files..."
+        download_db_files "$TAGINFO_DB_BASE_URL"
+    fi
+    cd $WORKDIR/taginfo/web && ./taginfo.rb
 }
 
 ACTION=$1