Compare commits

..

3 Commits
1.14 ... 1.15

Author SHA1 Message Date
Dave Conroy
6bd534258e Add support to backup password protected Redis Hosts 2019-05-24 13:58:54 -07:00
Dave Conroy
48bea7aeee Merge pull request #11 from claudioaltamura/master
chg: added AUTH for redis
2019-05-24 13:55:59 -07:00
Claudio Altamura
c3179d58ba chg: added AUTH for redis 2019-05-22 13:03:57 +02:00
2 changed files with 17 additions and 12 deletions

View File

@@ -1,3 +1,7 @@
## 1.15 - 2019-05-24 - <claudioaltamura @ github>
* Added abaility to backup password protected Redis Hosts
## 1.14 - 2019-04-20 - <dave at tiredofit dot ca> ## 1.14 - 2019-04-20 - <dave at tiredofit dot ca>
* Switch to using locally built mongodb-tools from tiredofit/mongo-builder due to Alpine removing precompiled packages from repositories * Switch to using locally built mongodb-tools from tiredofit/mongo-builder due to Alpine removing precompiled packages from repositories

View File

@@ -84,6 +84,7 @@ fi
"redis" | "REDIS" ) "redis" | "REDIS" )
DBTYPE=redis DBTYPE=redis
DBPORT=${DB_PORT:-6379} DBPORT=${DB_PORT:-6379}
[[ ( -n "${DB_PASS}" ) ]] && REDIS_PASS_STR=" -a ${DBPASS}"
;; ;;
"rethink" | "RETHINK" ) "rethink" | "RETHINK" )
DBTYPE=rethink DBTYPE=rethink
@@ -166,13 +167,13 @@ function backup_pgsql() {
function backup_redis() { function backup_redis() {
TARGET=redis_${db}_${DBHOST}_${now}.rdb TARGET=redis_${db}_${DBHOST}_${now}.rdb
echo bgsave | redis-cli -h ${DBHOST} -p ${DBPORT} --rdb ${TMPDIR}/${TARGET} echo bgsave | redis-cli -h ${DBHOST} -p ${DBPORT} ${REDIS_PASS_STR} --rdb ${TMPDIR}/${TARGET}
echo "** [db-backup] Dumping Redis - Flushing Redis Cache First" echo "** [db-backup] Dumping Redis - Flushing Redis Cache First"
sleep 10 sleep 10
try=5 try=5
while [ $try -gt 0 ] ; do while [ $try -gt 0 ] ; do
saved=$(echo 'info Persistence' | redis-cli -h ${DBHOST} -p ${DBPORT} | awk '/rdb_bgsave_in_progress:0/{print "saved"}') saved=$(echo 'info Persistence' | redis-cli -h ${DBHOST} -p ${DBPORT} ${REDIS_PASS_STR} | awk '/rdb_bgsave_in_progress:0/{print "saved"}')
ok=$(echo 'info Persistence' | redis-cli -h ${DBHOST} -p ${DBPORT} | awk '/rdb_last_bgsave_status:ok/{print "ok"}') ok=$(echo 'info Persistence' | redis-cli -h ${DBHOST} -p ${DBPORT} ${REDIS_PASS_STR} | awk '/rdb_last_bgsave_status:ok/{print "ok"}')
if [[ "$saved" = "saved" ]] && [[ "$ok" = "ok" ]]; then if [[ "$saved" = "saved" ]] && [[ "$ok" = "ok" ]]; then
echo "** [db-backup] Redis Backup Complete" echo "** [db-backup] Redis Backup Complete"
fi fi