[pica-db-backup] Formatting

* replace tabs with spaces
* use a more standard format for 'for' loops

pica-db-backup/backup_env_var.py

@@ -38,7 +38,7 @@ flag_postgres = False
 for service in services_list:
     if services_list[service]["Type"] == "mongo":
 
-	# Mongo DB handling
+        # Mongo DB handling
         add_value_to_key(service,"MONGO_SERVICE_NAME_LIST")
         add_value_to_key(services_list[service]["Host"],"MONGO_HOST_LIST")
         add_value_to_key(services_list[service]["Port"],"MONGO_PORT_LIST")
@@ -75,7 +75,7 @@ for service in services_list:
 
     if services_list[service]["Type"] == "postgres":
 
-	# PostgreSQL handling
+        # PostgreSQL handling
         add_value_to_key(service,"POSTGRES_SERVICE_NAME_LIST")
         add_value_to_key(services_list[service]["Host"],"POSTGRES_HOST_LIST")
         add_value_to_key(services_list[service]["Port"],"POSTGRES_PORT_LIST")

pica-db-backup/run.sh

@@ -5,17 +5,17 @@
 ###############################
 # Needed env for each DB type #
 ###############################
-# MYSQL											POSTGRESQL                        MONGODB
-# MYSQL_SERVICE_NAME_LIST		POSTGRES_SERVICE_NAME_LIST        MONGO_SERVICE_NAME_LIST
-# MYSQL_HOST_LIST						POSTGRES_HOST_LIST                MONGO_HOST_LIST
-# MYSQL_PORT_LIST						POSTGRES_PORT_LIST                MONGO_PORT_LIST
-# MYSQL_USER_LIST						POSTGRES_USER_LIST                MONGO_USER_LIST
-# MYSQL_PASS_LIST						POSTGRES_PASS_LIST                MONGO_PASS_LIST
-# MYSQL_DB_LIST							POSTGRES_DB_LIST                  MONGO_DB_LIST
-# MYSQL_INIT_BACKUP_LIST		POSTGRES_INIT_BACKUP_LIST         MONGO_INIT_BACKUP_LIST
-# MYSQL_CRON_TIME_LIST			POSTGRES_CRON_TIME_LIST           MONGO_CRON_TIME_LIST
-# MYSQL_EXTRA_OPTS_LIST			POSTGRES_EXTRA_OPTS-LIST          MONGO_BACKUP_FOLDER_LIST
-# MYSQL_BACKUP_FOLDER_LIST	POSTGRESQL_BACKUP_FOLDER_LIST
+# MYSQL                     POSTGRESQL                        MONGODB
+# MYSQL_SERVICE_NAME_LIST   POSTGRES_SERVICE_NAME_LIST        MONGO_SERVICE_NAME_LIST
+# MYSQL_HOST_LIST           POSTGRES_HOST_LIST                MONGO_HOST_LIST
+# MYSQL_PORT_LIST           POSTGRES_PORT_LIST                MONGO_PORT_LIST
+# MYSQL_USER_LIST           POSTGRES_USER_LIST                MONGO_USER_LIST
+# MYSQL_PASS_LIST           POSTGRES_PASS_LIST                MONGO_PASS_LIST
+# MYSQL_DB_LIST             POSTGRES_DB_LIST                  MONGO_DB_LIST
+# MYSQL_INIT_BACKUP_LIST    POSTGRES_INIT_BACKUP_LIST         MONGO_INIT_BACKUP_LIST
+# MYSQL_CRON_TIME_LIST      POSTGRES_CRON_TIME_LIST           MONGO_CRON_TIME_LIST
+# MYSQL_EXTRA_OPTS_LIST     POSTGRES_EXTRA_OPTS-LIST          MONGO_BACKUP_FOLDER_LIST
+# MYSQL_BACKUP_FOLDER_LIST  POSTGRESQL_BACKUP_FOLDER_LIST
 
 #################
 # Reset crontab #
@@ -72,54 +72,51 @@ read -a MONGO_BACKUP_FOLDER_ARRAY <<< "$MONGO_BACKUP_FOLDER_LIST"
 #Execute MySQL backups
 NB_CALLS=${#MYSQL_HOST_ARRAY[@]}
 
-for (( i=0; i < $NB_CALLS; i++ ))
-do
-	MYSQL_SERVICE_NAME=${MYSQL_SERVICE_NAME_ARRAY[i]} \
-	MYSQL_HOST=${MYSQL_HOST_ARRAY[i]} \
-	MYSQL_PORT=${MYSQL_PORT_ARRAY[i]} \
-	MYSQL_USER=${MYSQL_USER_ARRAY[i]} \
-	MYSQL_PASS=${MYSQL_PASS_ARRAY[i]} \
-	MYSQL_DB=${MYSQL_DB_ARRAY[i]} \
-	INIT_BACKUP=${MYSQL_INIT_BACKUP_ARRAY[i]} \
-	CRON_TIME=${MYSQL_CRON_TIME_ARRAY[i]} \
-	EXTRA_OPTS=${MYSQL_EXTRA_OPTS_ARRAY[i]} \
-	BACKUP_FOLDER="/backup/${MYSQL_BACKUP_FOLDER_ARRAY[i]}/" \
-	/scripts/mysql/mysql-run.sh
+for (( i=0; i < $NB_CALLS; i++ )); do
+  MYSQL_SERVICE_NAME=${MYSQL_SERVICE_NAME_ARRAY[i]} \
+  MYSQL_HOST=${MYSQL_HOST_ARRAY[i]} \
+  MYSQL_PORT=${MYSQL_PORT_ARRAY[i]} \
+  MYSQL_USER=${MYSQL_USER_ARRAY[i]} \
+  MYSQL_PASS=${MYSQL_PASS_ARRAY[i]} \
+  MYSQL_DB=${MYSQL_DB_ARRAY[i]} \
+  INIT_BACKUP=${MYSQL_INIT_BACKUP_ARRAY[i]} \
+  CRON_TIME=${MYSQL_CRON_TIME_ARRAY[i]} \
+  EXTRA_OPTS=${MYSQL_EXTRA_OPTS_ARRAY[i]} \
+  BACKUP_FOLDER="/backup/${MYSQL_BACKUP_FOLDER_ARRAY[i]}/" \
+  /scripts/mysql/mysql-run.sh
 done
 
 #Execute PostgreSQL backups
 NB_CALLS=${#POSTGRES_HOST_ARRAY[@]}
 
-for (( i=0; i < $NB_CALLS; i++ ))
-do
-	POSTGRES_SERVICE_NAME=${POSTGRES_SERVICE_NAME_ARRAY[i]} \
-	POSTGRES_HOST=${POSTGRES_HOST_ARRAY[i]} \
-	POSTGRES_PORT=${POSTGRES_PORT_ARRAY[i]} \
-	POSTGRES_USER=${POSTGRES_USER_ARRAY[i]} \
-	POSTGRES_PASS=${POSTGRES_PASS_ARRAY[i]} \
-	POSTGRES_DB=${POSTGRES_DB_ARRAY[i]} \
-	INIT_BACKUP=${POSTGRES_INIT_BACKUP_ARRAY[i]} \
-	CRON_TIME=${POSTGRES_CRON_TIME_ARRAY[i]} \
-	EXTRA_OPTS=${POSTGRES_EXTRA_OPTS_ARRAY[i]} \
-	BACKUP_FOLDER="/backup/${POSTGRES_BACKUP_FOLDER_ARRAY[i]}/" \
-	/scripts/postgresql/postgres-run.sh
+for (( i=0; i < $NB_CALLS; i++ )); do
+  POSTGRES_SERVICE_NAME=${POSTGRES_SERVICE_NAME_ARRAY[i]} \
+  POSTGRES_HOST=${POSTGRES_HOST_ARRAY[i]} \
+  POSTGRES_PORT=${POSTGRES_PORT_ARRAY[i]} \
+  POSTGRES_USER=${POSTGRES_USER_ARRAY[i]} \
+  POSTGRES_PASS=${POSTGRES_PASS_ARRAY[i]} \
+  POSTGRES_DB=${POSTGRES_DB_ARRAY[i]} \
+  INIT_BACKUP=${POSTGRES_INIT_BACKUP_ARRAY[i]} \
+  CRON_TIME=${POSTGRES_CRON_TIME_ARRAY[i]} \
+  EXTRA_OPTS=${POSTGRES_EXTRA_OPTS_ARRAY[i]} \
+  BACKUP_FOLDER="/backup/${POSTGRES_BACKUP_FOLDER_ARRAY[i]}/" \
+  /scripts/postgresql/postgres-run.sh
 done
 
 #Execute MongoDB backups
 NB_CALLS=${#MONGO_HOST_ARRAY[@]}
 
-for (( i=0; i < $NB_CALLS; i++ ))
-do
-        MONGO_SERVICE_NAME=${MONGO_SERVICE_NAME_ARRAY[i]} \
-        MONGO_HOST=${MONGO_HOST_ARRAY[i]} \
-        MONGO_PORT=${MONGO_PORT_ARRAY[i]} \
-        MONGO_USER=${MONGO_USER_ARRAY[i]} \
-        MONGO_PASS=${MONGO_PASS_ARRAY[i]} \
-        MONGO_DB=${MONGO_DB_ARRAY[i]} \
-        INIT_BACKUP=${MONGO_INIT_BACKUP_ARRAY[i]} \
-        CRON_TIME=${MONGO_CRON_TIME_ARRAY[i]} \
-        BACKUP_FOLDER="/backup/${MONGO_BACKUP_FOLDER_ARRAY[i]}/" \
-        /scripts/mongodb/mongo-run.sh
+for (( i=0; i < $NB_CALLS; i++ )); do
+  MONGO_SERVICE_NAME=${MONGO_SERVICE_NAME_ARRAY[i]} \
+  MONGO_HOST=${MONGO_HOST_ARRAY[i]} \
+  MONGO_PORT=${MONGO_PORT_ARRAY[i]} \
+  MONGO_USER=${MONGO_USER_ARRAY[i]} \
+  MONGO_PASS=${MONGO_PASS_ARRAY[i]} \
+  MONGO_DB=${MONGO_DB_ARRAY[i]} \
+  INIT_BACKUP=${MONGO_INIT_BACKUP_ARRAY[i]} \
+  CRON_TIME=${MONGO_CRON_TIME_ARRAY[i]} \
+  BACKUP_FOLDER="/backup/${MONGO_BACKUP_FOLDER_ARRAY[i]}/" \
+  /scripts/mongodb/mongo-run.sh
 done
 
 exec cron -f