Skip to content

Commit

Permalink
Bump confd to 1.3
Browse files Browse the repository at this point in the history
This since there is breaking changes.
  • Loading branch information
mattiaswal committed Nov 28, 2024
1 parent 6ee5432 commit c511ea6
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package/confd/confd.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/confd/configure.ac
Original file line number Diff line number Diff line change
@@ -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)

Expand All @@ -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
])
Expand Down
16 changes: 16 additions & 0 deletions src/confd/share/migrate/1.3/10-ssh-server.sh
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 2 additions & 0 deletions src/confd/share/migrate/1.3/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
migratedir = $(pkgdatadir)/migrate/1.3
dist_migrate_DATA = 10-ssh-server.sh
2 changes: 1 addition & 1 deletion src/confd/share/migrate/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SUBDIRS = 1.0 1.1 1.2
SUBDIRS = 1.0 1.1 1.2 1.3
migratedir = $(pkgdatadir)/migrate

0 comments on commit c511ea6

Please sign in to comment.