From be1b7cdf4585231a785daa2d06f880ba8d016536 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias@waldekranz.com>
Date: Wed, 15 Jan 2025 10:10:57 +0100
Subject: [PATCH] confd: Enable remote SSH access via IPv6 in
 {factory,failure}-config

The default was set to only accept connections from localhost when
connecting via IPv6. This was not caught in testing since the
test-config accepts connections from all hosts (::).

Accept connections from all hosts in all builtin configs. Inherit
test-config's service definition from factory-config, since we want
testing to be done as close as possible to what are users are running.
---
 .../share/factory.d/10-infix-services.json    |  2 +-
 .../share/failure.d/10-infix-services.json    |  2 +-
 src/confd/share/test.d/10-infix-services.json | 28 +------------------
 3 files changed, 3 insertions(+), 29 deletions(-)
 mode change 100644 => 120000 src/confd/share/test.d/10-infix-services.json

diff --git a/src/confd/share/factory.d/10-infix-services.json b/src/confd/share/factory.d/10-infix-services.json
index 5e86d69c..f7b36180 100644
--- a/src/confd/share/factory.d/10-infix-services.json
+++ b/src/confd/share/factory.d/10-infix-services.json
@@ -15,7 +15,7 @@
 	    },
 	    {
 		"name": "ipv6",
-		"address": "::1",
+		"address": "::",
 		"port": 22
 	    }
 	],
diff --git a/src/confd/share/failure.d/10-infix-services.json b/src/confd/share/failure.d/10-infix-services.json
index 4371cbb5..a5ef5102 100644
--- a/src/confd/share/failure.d/10-infix-services.json
+++ b/src/confd/share/failure.d/10-infix-services.json
@@ -21,7 +21,7 @@
 	    },
 	    {
 		"name": "ipv6",
-		"address": "::1",
+		"address": "::",
 		"port": 22
 	    }
 	],
diff --git a/src/confd/share/test.d/10-infix-services.json b/src/confd/share/test.d/10-infix-services.json
deleted file mode 100644
index 89b1c909..00000000
--- a/src/confd/share/test.d/10-infix-services.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "infix-services:mdns": {
-		"enabled": true
-    },
-    "infix-services:web": {
-		"enabled": true,
-		"restconf": {
-			"enabled": true
-		}
-    },
-    "infix-services:ssh": {
-	"enabled": true,
-	"listen": [
-	    {
-		"name": "ipv4",
-		"address": "0.0.0.0",
-		"port": 22
-	    },
-	    {
-		"name": "ipv6",
-		"address": "::",
-		"port": 22
-	    }
-	],
-	"hostkey": [ "genkey" ]
-    }
-}
diff --git a/src/confd/share/test.d/10-infix-services.json b/src/confd/share/test.d/10-infix-services.json
new file mode 120000
index 00000000..b03ef0f0
--- /dev/null
+++ b/src/confd/share/test.d/10-infix-services.json
@@ -0,0 +1 @@
+../factory.d/10-infix-services.json
\ No newline at end of file