1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/garage_ynh.git synced 2024-09-03 18:36:32 +02:00

Merge pull request #1 from YunoHost-Apps/testing

Merge testing changes
This commit is contained in:
lapineige 2023-12-19 13:39:58 +01:00 committed by GitHub
commit bda06ec1cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions

View file

@ -138,7 +138,7 @@ ynh_app_setting_set --app=$app --key=secret_node_id --value=$secret_node_id
# define node
$garage layout assign $secret_node_id -z $domain -c $weight -t $domain
$garage layout assign $secret_node_id -z $domain -c ${weight}GB -t $domain
# if there is enough node, apply layout
garage_layout_apply

View file

@ -65,10 +65,21 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
# RECREATE CONFIGURATION
#=================================================
sleep 2
i=0
# sometimes server need some time to start
while [ -z "$($garage node id -q 2>/dev/null | cut -d '@' -f1)" ]; do
i=$(( i + 1 ))
[ $i -le 30 ] || { $garage node id || true; ynh_die --message="unable to get node id"; }
sleep 1
done
# restoring garage can lead to change node id
secret_node_id=$($garage node id -q 2>/dev/null | cut -d '@' -f1)
ynh_app_setting_set --app=$app --key=secret_node_id --value=$secret_node_id
# define node
$garage layout assign $secret_node_id -z $domain -c $weight -t $domain
$garage layout assign $secret_node_id -z $domain -c ${weight}GB -t $domain
# if there is enough node, apply layout
garage_layout_apply