From 4140cd58d7cae8e4855f4e500f5f65a133c13cae Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 7 Feb 2022 17:18:16 +0100
Subject: [PATCH] Fix

---
 scripts/_common.sh | 60 ++++++++++++++++------------------------------
 scripts/backup     |  7 ------
 scripts/restore    |  7 ------
 3 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index b5fc7ed..839f144 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -29,54 +29,36 @@ libreoffice_app_dependencies="unoconv libreoffice-writer"
 # usage: ynh_redis_get_free_db
 # | returns: the database number to use
 ynh_redis_get_free_db() {
-	local result max db
-	result=$(redis-cli INFO keyspace)
+    local result max db
+    result="$(redis-cli INFO keyspace)"
 
-	# get the num
-	max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+")
+    # get the num
+    max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+")
 
-	db=0
-	# default Debian setting is 15 databases
-	for i in $(seq 0 "$max")
-	do
-	 	if ! echo "$result" | grep -q "db$i"
-	 	then
-			db=$i
-	 		break 1
- 		fi
- 		db=-1
-	done
+    db=0
+    # default Debian setting is 15 databases
+    for i in $(seq 0 "$max")
+    do
+        if ! echo "$result" | grep -q "db$i"
+        then
+            db=$i
+            break 1
+        fi
+        db=-1
+    done
 
-	test "$db" -eq -1 && ynh_die --message="No available Redis databases..."
+    test "$db" -eq -1 && ynh_die --message="No available Redis databases..."
 
-	echo "$db"
+    echo "$db"
 }
 
-# Flush Redis key
+# Create a master password and set up global settings
+# Please always call this script in install and restore scripts
 #
 # usage: ynh_redis_remove_db database
 # | arg: database - the database to erase
 ynh_redis_remove_db() {
-	local db=$1
-	redis-cli -n "$db" flushall
+    local db=$1
+    redis-cli -n "$db" flushall
 }
 
-
-dump_location=/var/lib/redis/dump.rdb
-#destination=/tmp/dump-$(date +"%Y%m%d").rdb
-# Restore a database
-#
-ynh_redis_restore_db() {
-	cat $dump_location | redis-cli -x restore mykey $ynh_redis_get_free_db	
-}
-
-
-# Dump a database
-#
-ynh_redis_dump_db() {
-	# Declare an array to define the options of this helper.
-	local db=$1
-
-	redis-cli SET mykey "$db"
-	redis-cli --raw dump mykey | head -c-1 > $dump_location	
-}
diff --git a/scripts/backup b/scripts/backup
index 0cf894b..b66f2b1 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -56,13 +56,6 @@ ynh_backup --src_path="/etc/logrotate.d/$app"
 
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
-#=================================================
-# BACKUP THE REDIS DATABASE
-#=================================================
-ynh_print_info --message="Backing up the Redis database..."
-
-ynh_redis_dump_db
-
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index c129af2..e2dfc6f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -74,13 +74,6 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=7
 # Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
-#=================================================
-# RESTORE THE REDIS DATABASE
-#=================================================
-ynh_script_progression --message="Restoring the Redis database..." --weight=1
-
-ynh_redis_restore_db
-
 #=================================================
 # RESTORE SYSTEMD
 #=================================================