From c511ea6d85e988107fd85a5fa813fcd63a79fd2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <lazzer@gmail.com>
Date: Tue, 26 Nov 2024 21:30:20 +0100
Subject: [PATCH] Bump confd to 1.3

This since there is breaking changes.
---
 package/confd/confd.mk                       |  2 +-
 src/confd/configure.ac                       |  3 ++-
 src/confd/share/migrate/1.3/10-ssh-server.sh | 16 ++++++++++++++++
 src/confd/share/migrate/1.3/Makefile.am      |  2 ++
 src/confd/share/migrate/Makefile.am          |  2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100755 src/confd/share/migrate/1.3/10-ssh-server.sh
 create mode 100644 src/confd/share/migrate/1.3/Makefile.am

diff --git a/package/confd/confd.mk b/package/confd/confd.mk
index 70f4b8e96..64bb2d91a 100644
--- a/package/confd/confd.mk
+++ b/package/confd/confd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CONFD_VERSION = 1.2
+CONFD_VERSION = 1.3
 CONFD_SITE_METHOD = local
 CONFD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/confd
 CONFD_LICENSE = BSD-3-Clause
diff --git a/src/confd/configure.ac b/src/confd/configure.ac
index 639ba8b69..04a2de72f 100644
--- a/src/confd/configure.ac
+++ b/src/confd/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.61)
 # confd version is same as system YANG model version, step on breaking changes
-AC_INIT([confd], [1.2], [https://github.com/kernelkit/infix/issues])
+AC_INIT([confd], [1.3], [https://github.com/kernelkit/infix/issues])
 AM_INIT_AUTOMAKE(1.11 foreign subdir-objects)
 AM_SILENT_RULES(yes)
 
@@ -16,6 +16,7 @@ AC_CONFIG_FILES([
 	share/migrate/1.0/Makefile
 	share/migrate/1.1/Makefile
 	share/migrate/1.2/Makefile
+	share/migrate/1.3/Makefile
 	src/Makefile
 	yang/Makefile
 ])
diff --git a/src/confd/share/migrate/1.3/10-ssh-server.sh b/src/confd/share/migrate/1.3/10-ssh-server.sh
new file mode 100755
index 000000000..c6c0b02bb
--- /dev/null
+++ b/src/confd/share/migrate/1.3/10-ssh-server.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# SSH is now configurable, add default settings to configuration
+
+file=$1
+temp=${file}.tmp
+
+jq '.["infix-services:ssh"] = {
+      "enabled": true,
+      "hostkey": ["genkey"],
+      "listen": [
+        {"name": "ipv4", "address": "0.0.0.0", "port": 22},
+        {"name": "ipv6", "address": "::", "port": 22}
+      ]
+    }' "$file" > "$temp"
+
+mv "$temp" "$file"
diff --git a/src/confd/share/migrate/1.3/Makefile.am b/src/confd/share/migrate/1.3/Makefile.am
new file mode 100644
index 000000000..93fb662d2
--- /dev/null
+++ b/src/confd/share/migrate/1.3/Makefile.am
@@ -0,0 +1,2 @@
+migratedir          = $(pkgdatadir)/migrate/1.3
+dist_migrate_DATA   = 10-ssh-server.sh
diff --git a/src/confd/share/migrate/Makefile.am b/src/confd/share/migrate/Makefile.am
index df1d8ba9d..6fb10b5e5 100644
--- a/src/confd/share/migrate/Makefile.am
+++ b/src/confd/share/migrate/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS             = 1.0 1.1 1.2
+SUBDIRS             = 1.0 1.1 1.2 1.3
 migratedir          = $(pkgdatadir)/migrate