From 7102bb4d0a3294de746246d95795fe804389192b Mon Sep 17 00:00:00 2001 From: Mark J Crane Date: Thu, 30 Mar 2017 21:12:10 +0000 Subject: [PATCH] Add a sleep and date --- debian/resources/backup/fusionpbx-backup.sh | 2 +- .../resources/backup/fusionpbx-maintenance.sh | 2 +- debian/resources/postgresql/bdr.sh | 24 +++++++++++++++---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/debian/resources/backup/fusionpbx-backup.sh b/debian/resources/backup/fusionpbx-backup.sh index 68625f7..755cb3d 100755 --- a/debian/resources/backup/fusionpbx-backup.sh +++ b/debian/resources/backup/fusionpbx-backup.sh @@ -1,6 +1,6 @@ #!/bin/sh -export PGPASSWORD="zzz" +#export PGPASSWORD="zzz" db_host=127.0.0.1 db_port=5432 diff --git a/debian/resources/backup/fusionpbx-maintenance.sh b/debian/resources/backup/fusionpbx-maintenance.sh index ec58653..73b68b2 100755 --- a/debian/resources/backup/fusionpbx-maintenance.sh +++ b/debian/resources/backup/fusionpbx-maintenance.sh @@ -1,7 +1,7 @@ #!/bin/sh #settings -export PGPASSWORD="zzz" +#export PGPASSWORD="zzz" db_host=127.0.0.1 db_port=5432 switch_package=true # true or false diff --git a/debian/resources/postgresql/bdr.sh b/debian/resources/postgresql/bdr.sh index af7d5b1..a91451f 100755 --- a/debian/resources/postgresql/bdr.sh +++ b/debian/resources/postgresql/bdr.sh @@ -6,6 +6,9 @@ cd "$(dirname "$0")" #includes . ../config.sh +#set the date +now=$(date +%Y-%m-%d) + if [ .$database_password = .'random' ]; then database_password=$(dd if=/dev/urandom bs=1 count=20 2>/dev/null | base64 | sed 's/[=\+//]//g') fi @@ -27,9 +30,9 @@ else fi #settings summary -echo "" -echo "Summary" -#echo "" +echo "-----------------------------"; +echo " Summary"; +echo "-----------------------------"; echo "Create Group: $group_create"; echo "All Node IP Addresses: $nodes"; if [ .$group_create = .true ]; then @@ -64,9 +67,11 @@ chown postgres:postgres /etc/ssl/private/ssl-cert-snakeoil-postgres.key chmod 600 /etc/ssl/private/ssl-cert-snakeoil-postgres.key #postgresql.conf - append settings -cat ../postgresql/postgresql.conf >> /etc/postgresql/9.4/main/postgresql.conf +cp /etc/postgresql/9.4/main/postgresql.conf /etc/postgresql/9.4/main/postgresql.conf-$now +cat ../postgresql/postgresql.conf > /etc/postgresql/9.4/main/postgresql.conf #pg_hba.conf - append settings +cp /etc/postgresql/9.4/main/pg_hba.conf /etc/postgresql/9.4/main/pg_hba.conf-$now cat ../postgresql/pg_hba.conf > /etc/postgresql/9.4/main/pg_hba.conf #chmod 640 /etc/postgresql/9.4/main/pg_hba.conf #chown -R postgres:postgres /etc/postgresql/9.4/main @@ -109,8 +114,19 @@ fi #load the freeswitch database #sudo -u postgres psql -d freeswitch -f /var/www/fusionpbx/resources/install/sql/switch.sql -L /tmp/switch-sql.log +#sleeping +if [ .$group_create = .false ]; then + echo "Sleeping for 15 seconds"; + for i in `seq 1 15`; do + echo $i + sleep 1 + done +fi + #add extension pgcrypto if [ .$group_create = .false ]; then sudo -u postgres psql -d freeswitch -c "CREATE EXTENSION pgcrypto;"; fi +#message to user +echo "Completed"