mirror of
				https://github.com/YunoHost-Apps/send_ynh.git
				synced 2025-11-03 23:35:35 +01:00 
			
		
		
		
	Merge pull request #30 from YunoHost-Apps/helpers
Use standard redis helpers
This commit is contained in:
		@@ -18,7 +18,7 @@ demo = "https://send.vis.ee/"
 | 
				
			|||||||
code = "https://github.com/timvisee/send"
 | 
					code = "https://github.com/timvisee/send"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[integration]
 | 
					[integration]
 | 
				
			||||||
yunohost = ">= 11.2"
 | 
					yunohost = ">= 11.2.12"
 | 
				
			||||||
architectures = ["amd64", "arm64", "armhf"]
 | 
					architectures = ["amd64", "arm64", "armhf"]
 | 
				
			||||||
multi_instance = true
 | 
					multi_instance = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,41 +17,3 @@ nodejs_version=16
 | 
				
			|||||||
#=================================================
 | 
					#=================================================
 | 
				
			||||||
# FUTURE OFFICIAL HELPERS
 | 
					# FUTURE OFFICIAL HELPERS
 | 
				
			||||||
#=================================================
 | 
					#=================================================
 | 
				
			||||||
 | 
					 | 
				
			||||||
# get the first available redis database
 | 
					 | 
				
			||||||
#
 | 
					 | 
				
			||||||
# 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)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	# 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
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	test "$db" -eq -1 && ynh_die --message="No available Redis databases..."
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	echo "$db"
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# 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
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user