From 38f308910a4dcec2999c52068526bf020c338581 Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Sun, 17 Aug 2025 14:03:15 +0200
Subject: [PATCH 1/2] fix: $ABRA_DIR/servers=0700, $ABRA_DIR/servers/foo=0600

See https://git.coopcloud.tech/toolshed/abra/issues/580
---
 cli/run.go                        | 2 +-
 tests/integration/dirs.bats       | 2 +-
 tests/integration/server_add.bats | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cli/run.go b/cli/run.go
index 0dc320d7..13dd8aad 100644
--- a/cli/run.go
+++ b/cli/run.go
@@ -33,7 +33,7 @@ func Run(version, commit string) {
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			dirs := []map[string]os.FileMode{
 				{config.ABRA_DIR: 0764},
-				{config.SERVERS_DIR: 0600},
+				{config.SERVERS_DIR: 0700},
 				{config.RECIPES_DIR: 0764},
 				{config.LOGS_DIR: 0764},
 			}
diff --git a/tests/integration/dirs.bats b/tests/integration/dirs.bats
index c391e0dc..b6d4acc0 100644
--- a/tests/integration/dirs.bats
+++ b/tests/integration/dirs.bats
@@ -39,5 +39,5 @@ setup(){
   assert_not_exists "$ABRA_DIR/catalogue"
 
   server_dir_perms=$(stat -c "%a" "$ABRA_DIR/servers")
-  assert_equal $server_dir_perms "600"
+  assert_equal $server_dir_perms "700"
 }
diff --git a/tests/integration/server_add.bats b/tests/integration/server_add.bats
index 6de57779..d31d064b 100644
--- a/tests/integration/server_add.bats
+++ b/tests/integration/server_add.bats
@@ -25,6 +25,9 @@ teardown(){
   assert_output --partial "$TEST_SERVER"
 
   assert bash -c "docker context ls | grep -q $TEST_SERVER"
+
+  server_dir_perms=$(stat -c "%a" "$ABRA_DIR/servers/$TEST_SERVER")
+  assert_equal $server_dir_perms "600"
 }
 
 @test "error if using name and --local together" {
@@ -39,6 +42,9 @@ teardown(){
   assert_exists "$ABRA_DIR/servers/default"
   assert bash -c "docker context ls | grep -q default"
   assert_output --partial 'local server successfully added'
+
+  server_dir_perms=$(stat -c "%a" "$ABRA_DIR/servers/$TEST_SERVER")
+  assert_equal $server_dir_perms "600"
 }
 
 @test "create local server fails when no docker swarm" {
-- 
2.49.0


From 4193d63d23b525b16ad94a53594c66c0c9dc65f1 Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Sun, 17 Aug 2025 14:04:00 +0200
Subject: [PATCH 2/2] test: advertise locally to avoid multiple ip error

---
 tests/integration/helpers/docker.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/helpers/docker.bash b/tests/integration/helpers/docker.bash
index 52d5b9c9..a8304890 100644
--- a/tests/integration/helpers/docker.bash
+++ b/tests/integration/helpers/docker.bash
@@ -2,7 +2,7 @@
 
 _ensure_swarm() {
   if [ "$(docker info | grep Swarm | sed 's/Swarm: //g' | tr -d ' ')" == "inactive" ]; then
-    run docker swarm init
+    run docker swarm init --advertise-addr 127.0.0.1:2377
     assert_success
   fi
 
-- 
2.49.0