Update docs and merge env var files in db-utils

Author: Rub21

docker-compose.yml

@@ -46,13 +46,12 @@ services:
       - ./data/planet-dump-data:/mnt/data
     command: >
       /bin/bash -c "
-        echo 'Set cronjob for planet-dump, every 3 minutes';
-        sleep 1m;
-        while :; do echo 'Creating the planet dump file...'; /start.sh; sleep 3m; done;
+        echo 'Set cronjob for planet-dump, every 4 minutes';
+        while :; do sleep 4m; echo 'Creating the planet dump file...'; /start.sh; done;
       "
     env_file:
       - ./envs/.env.db
-      - ./envs/.env.planet-dump
+      - ./envs/.env.db-utils
       - ./envs/.env.cloudprovider
     depends_on:
       - db
@@ -68,13 +67,12 @@ services:
       - ./data/db-backup-restore-data:/mnt/data
     command: >
       /bin/bash -c "
-        echo 'Set cron job for backing up DB, every 3m minutes';
-        sleep 1m;
-        while :; do echo 'Creating DB backup...'; /start.sh; sleep 3m; done;
+        echo 'Set cron job for backing up DB, every 4 minutes';
+        while :; do sleep 4m; echo 'Creating DB backup...'; /start.sh; done;
       "
     env_file:
       - ./envs/.env.db
-      - ./envs/.env.backup-restore
+      - ./envs/.env.db-utils
       - ./envs/.env.cloudprovider
     depends_on:
       - db
@@ -97,7 +95,7 @@ services:
       "
     env_file:
       - ./envs/.env.db
-      - ./envs/.env.replication-job
+      - ./envs/.env.db-utils
       - ./envs/.env.cloudprovider
     depends_on:
       - db
@@ -113,19 +111,18 @@ services:
       - ./data/full-history-data:/mnt/data
     command: >
       /bin/bash -c "
-        echo 'Set cron job for full history PBF file, every 3m minutes';
-        sleep 1m;
-        while :; do echo 'Creating full history PBF file...'; /start.sh; sleep 3m; done;
+        echo 'Set cron job for full history PBF file, every 4 minutes';
+        while :; do sleep 4m; echo 'Creating full history PBF file...'; /start.sh;  done;
       "
     env_file:
       - ./envs/.env.db
-      - ./envs/.env.full-history
+      - ./envs/.env.db-utils
       - ./envs/.env.cloudprovider
     depends_on:
       - db
-  ######################################################
-  ### Populate apidb from PBF file
-  ######################################################
+  #####################################################
+  ## Populate apidb from PBF file
+  #####################################################
   populate-apidb:
     image: osmseed-populate-apidb:v1
     build:
@@ -142,7 +139,7 @@ services:
       "
     env_file:
       - ./envs/.env.db
-      - ./envs/.env.populate-apidb
+      - ./envs/.env.db-utils
   # ######################################################
   # ### Tiler DB
   # ######################################################

envs/.env.backup-restore.example

@@ -0,0 +1,44 @@
+
+#Osmosis tuning for server, This variable intends to use much as possible the memory in the server
+MEMORY_JAVACMD_OPTIONS=2Gi
+
+#######################################
+# Environment variables for overwrite full history planet PBF settings
+#######################################
+# OVERWRITE_FHISTORY_FILE=(true, false)
+OVERWRITE_FHISTORY_FILE=false
+
+#######################################
+# Environment variables for overwrite planet settings
+#######################################
+# OVERWRITE_PLANET_FILE=(true, false)
+OVERWRITE_PLANET_FILE=false
+
+#######################################
+# Environment variables for Replication job settings
+#######################################
+
+# TODO:update start.sh and helm templates, for making this customizable
+REPLICATION_FOLDER=/replication/minute
+
+#######################################
+# Environment variables for minute Replication job settings
+#######################################
+
+# Link to a public pbf file
+# URL_FILE_TO_IMPORT=https://ds-data-projects.s3.amazonaws.com/dc-output.pbf
+# URL_FILE_TO_IMPORT=https://ds-data-projects.s3.amazonaws.com/osm-seed-data/ayac.pbf
+URL_FILE_TO_IMPORT=https://download.geofabrik.de/europe/monaco-latest.osm.pbf
+
+#######################################
+# Environment variable for DB back up or restore
+#######################################
+
+# DB_ACTION=("backup" or "backup")
+DB_ACTION=backup
+
+# In case we choose restore, we need to set RESTORE_URL_FILE with a public url file
+RESTORE_URL_FILE=http://osmseed.org/osmseed-211104_0055.sql.gz
+
+# TODO: remove this env file from helm template
+CLEAN_BACKUPS=false

envs/.env.db-utils.example

@@ -7,3 +7,4 @@ TILER_IMPORT_FROM=osm
 TILER_IMPORT_PBF_URL=https://download.geofabrik.de/europe/monaco-latest.osm.pbf
 SEQUENCE_NUMBER=4768
 REPLICATION_URL=https://download.openstreetmap.fr/replication/europe/monaco/minute/
+OVERWRITE_STATE=false

envs/.env.full-history.example

@@ -2,11 +2,7 @@
 cp ./envs/.env.web.example ./envs/.env.web
 cp ./envs/.env.db.example ./envs/.env.db
 cp ./envs/.env.cloudprovider.example ./envs/.env.cloudprovider
-cp ./envs/.env.planet-dump.example ./envs/.env.planet-dump
-cp ./envs/.env.backup-restore.example ./envs/.env.backup-restore
-cp ./envs/.env.replication-job.example ./envs/.env.replication-job
-cp ./envs/.env.full-history.example ./envs/.env.full-history
-cp ./envs/.env.populate-apidb.example ./envs/.env.populate-apidb
+cp ./envs/.env.db-utils.example ./envs/.env.db-utils
 cp ./envs/.env.tiler-db.example ./envs/.env.tiler-db
 cp ./envs/.env.tiler-imposm.example ./envs/.env.tiler-imposm
 cp ./envs/.env.tiler-server.example ./envs/.env.tiler-server

envs/.env.planet-dump.example

@@ -8,10 +8,10 @@ This container will create a backup of the osm-seed-db and compress according to
 In order to run this container we need environment variables, these can be found in the following files👇:
 
 - [.env.db.example](./../../envs/.env.db.example)
-- [.env.backup-restore.example](./../../envs/.env.backup-restore.example)
+- [.env.db-utils.example](./../../envs/.env.db-utils.example)
 - [.env.cloudprovider.example](./../../envs/.env.cloudprovider.example)
 
-**Note**: Rename the above files as `.env.db`, `.env.backup-restore` and `.env.cloudprovider`
+**Note**: Rename the above files as `.env.db`, `.env.db-utils` and `.env.cloudprovider`
 
 ### Running the container