synchro with bitbucket 2.1.2

atosorigin · Sep 16, 2020 · 924d324 · 924d324
1 parent 4770ef6
commit 924d324
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/backup_database.sh b/backup_database.sh
@@ -4,7 +4,7 @@ VERBOSE=""
 CONTAINER="pgadmin"
 BASEDIR=$(dirname $0)
 USER="mism"
-DB="mism"
+DB=""
 
 usage()
 {
@@ -33,10 +33,6 @@ while getopts "vu:t:f:" option; do
     esac
 done
 
-echo "TARGET=$TARGET"
-echo "FILENAME=$FILENAME"
-echo "USER=$USER"
-
 if [ -z ${FILENAME} ]
 then
     usage
@@ -61,16 +57,17 @@ fi
 if [ ${TARGET} = "awx" ]
 then
     HOST="awx_postgres"
+    DB="mism"
+
 fi
 
 if [ ${TARGET} = "zabbix" ]
 then
     HOST="zabbix-postgres"
+    DB="zabbix"
 fi
 
-echo "HOST=$HOST"
 export DEST_DIR="storage/pgadmin_bullsequana.com"
-echo "DEST_DIR=$DEST_DIR"
 
 if [ ! -d $DEST_DIR ]
 then
@@ -87,9 +84,10 @@ fi
 
 if [ ! -f $DEST_DIR/$FILENAME ]    
 then
-    echo ">> Database dump not generated in $DEST_DIR/$FILENAME !!!"
+
+    echo -e "\e[101m>> Database dump not generated in $DEST_DIR/$FILENAME !!!\e[0m"
     exit -1
 fi
 
-echo ">> The Database dump is saved under $BASEDIR/$DEST_DIR/${FILENAME}"
+echo -e "\e[42m>> The Database dump is saved under $BASEDIR/$DEST_DIR/${FILENAME}\e[0m"
 
diff --git a/install_awx.sh b/install_awx.sh
@@ -116,7 +116,7 @@ echo "starting BullSequana Edge Ansible AWX containers ...."
 docker-compose -f docker_compose_awx.yml up -d
 
 echo "----------------------------------------------------------------------------------------------------"
-echo "now wait 10 minutes for the migration to complete...."
+echo -e "Now wait \e[101m10 minutes\e[0m for the migration to complete...."
 echo "check the login page at https://localhost"
 echo "and run ./add_awx_playbooks.sh"
 echo "AWX is available on https://localhost"

diff --git a/restore_database.sh b/restore_database.sh
@@ -34,10 +34,6 @@ while getopts "vu:t:f:" option; do
     esac
 done
 
-echo "TARGET=$TARGET"
-echo "FILENAME=$FILENAME"
-echo "USER=$USER"
-
 if [ -z ${FILENAME} ]
 then
     usage
@@ -46,19 +42,22 @@ fi
 if [ ${TARGET} = "awx" ]
 then
     HOST="awx_postgres"
+    DB="mism"
 fi
 
 if [ ${TARGET} = "zabbix" ]
 then
     HOST="zabbix-postgres"
+    DB="zabbix"
 fi
 
-echo "HOST=$HOST"
-
 docker exec -e PGPASSWORD=${PWD} ${CONTAINER} /usr/local/pgsql-12/pg_restore --host ${HOST} --port "5432" --username=${USER} --dbname $DB -c ${VERBOSE} "/var/lib/pgadmin/storage/pgadmin_bullsequana.com/${FILENAME}"
 
 if [ $? -ne 0 ]; then
-    echo ">> Database restore failed !!!"
-else
-    echo ">> The Database is restored !"
+    echo -e "\e[101m>> The database restore failed !!! \e[0m"
+    exit -1
 fi
+
+echo -e "\e[42m>> The database is restored ! \e[0m"
+
+