From 728fa923b5ee38ca00a8e178547fcf92cd4e630d Mon Sep 17 00:00:00 2001
From: oiseauroch <contact@oiseauroch.fr>
Date: Tue, 19 Dec 2023 10:44:07 +0100
Subject: [PATCH 1/4] add setting for self bootstrap peer

---
 scripts/install | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/install b/scripts/install
index eeafaad..3f65675 100755
--- a/scripts/install
+++ b/scripts/install
@@ -149,6 +149,11 @@ fi
 
 self_bootstrap_peers="$($garage node id --quiet)"
 garage_layout="$($garage layout show)"
+
+self_bootstrap_peers="$($garage_command node id --quiet)"
+ynh_app_setting_set --app=$app --key=self_bootstrap_peers --value="$self_bootstrap_peers"
+
+garage_layout="$($garage_command layout show)"
 ynh_app_setting_set --app=$app --key=garage_layout --value="$garage_layout"
 
 #=================================================

From 90980267781e7c801692bf924a58c34c1d1509b8 Mon Sep 17 00:00:00 2001
From: oiseauroch <contact@oiseauroch.fr>
Date: Tue, 19 Dec 2023 10:43:13 +0100
Subject: [PATCH 2/4] Revert "add setting for self bootstrap peer"

This reverts commit 556cadf284737d66f8a010d95a0fe92a0e86d0a6.
---
 scripts/install | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 3f65675..3b94821 100755
--- a/scripts/install
+++ b/scripts/install
@@ -151,8 +151,6 @@ self_bootstrap_peers="$($garage node id --quiet)"
 garage_layout="$($garage layout show)"
 
 self_bootstrap_peers="$($garage_command node id --quiet)"
-ynh_app_setting_set --app=$app --key=self_bootstrap_peers --value="$self_bootstrap_peers"
-
 garage_layout="$($garage_command layout show)"
 ynh_app_setting_set --app=$app --key=garage_layout --value="$garage_layout"
 

From ee4f09ee549861cf0471e6731194fcd123d8bb2f Mon Sep 17 00:00:00 2001
From: oiseauroch <contact@oiseauroch.fr>
Date: Tue, 19 Dec 2023 10:46:50 +0100
Subject: [PATCH 3/4] add units to capacity

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 3b94821..4c321b8 100755
--- a/scripts/install
+++ b/scripts/install
@@ -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
 

From 47a48d3a12cf9ed25cfab162ee6a3b84009c0f93 Mon Sep 17 00:00:00 2001
From: oiseauroch <contact@oiseauroch.fr>
Date: Tue, 19 Dec 2023 13:31:33 +0100
Subject: [PATCH 4/4] change node id

---
 scripts/install |  3 ---
 scripts/restore | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index 4c321b8..10555e6 100755
--- a/scripts/install
+++ b/scripts/install
@@ -149,9 +149,6 @@ fi
 
 self_bootstrap_peers="$($garage node id --quiet)"
 garage_layout="$($garage layout show)"
-
-self_bootstrap_peers="$($garage_command node id --quiet)"
-garage_layout="$($garage_command layout show)"
 ynh_app_setting_set --app=$app --key=garage_layout --value="$garage_layout"
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 4062cf3..cb4c7d1 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -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