commit f976c0b35dec908196d35d20cca7a7b8c88ee4ca
from: xs <xs@inda.re>
date: Thu Jun  5 13:29:21 2025 UTC

v0.1.2 Temporary scp fix in the importer for SSH authorized_keys files

commit - 2427e5b9e01659ab59d4410fef6486af56794194
commit + f976c0b35dec908196d35d20cca7a7b8c88ee4ca
blob - 8bb631848269359b67d189681b0103a60f66e65f
blob + 83ed21f275dca816c26974bc53d9f772aca45fa1
--- Makefile
+++ Makefile
@@ -16,7 +16,7 @@
 .POSIX:
 PREFIX:=/usr/local
 SHELLS=ksh93 ksh yash sh
-UTILITY_VERSION=0.1.1
+UTILITY_VERSION=0.1.2
 UTILITY=$(PWD)/r7
 # To use the test suite, please edit or use environment for SSH parameters
 # SSH_ID=/path/to/.ssh/id_ed25519
@@ -27,6 +27,7 @@ all: tests
 
 release: r7.1
 	make tests
+	whoami
 	rm -fr _release/r7-$(UTILITY_VERSION)
 	mkdir -p _release/r7-$(UTILITY_VERSION)
 	cp LICENSE r7 r7.1 Makefile README.md _release/r7-$(UTILITY_VERSION)
blob - bd81cc502bd8ddf215fe1577fc211cbb83a3b14b
blob + 43e18f61d9bbcb6bf2b0dede01c1b1a728593c85
--- README.md
+++ README.md
@@ -1307,6 +1307,14 @@ import HOST
 
 ## License
 
+The provided group library is shared as additionnal examples of the
+documentation and contain the following third-party files under the ISC License.
+Copyright information are indicated in the LICENSE section of related files.
+
+- `pf-badhost.sh`
+- `unbound-adblock.sh`
+- `http-ban.sh`
+
 The project is shared under the terms of the ISC license. Any version previous
 `0.1.0` needs to be considered obsolete and should not be redistributed. History
 in the GIT repository is kept for transparency purpose only.
blob - 662d020a7b028c595500e97be5b2186010910844
blob + 63f562f979c18fd826259a16448ba122283edecd
--- r7
+++ r7
@@ -20,7 +20,7 @@
 # Global configuration
 # ====================
 
-VERSION=0.1.1
+VERSION=0.1.2
 : "${HOSTNAME:=$(uname -n)}"
 
 # shellcheck disable=SC2031
@@ -1273,6 +1273,8 @@ import() {
 		sysctl.conf
 		unwind.conf
 		resolv.conf
+		gotd.conf
+		gotwebd.conf
 	'
 	etc_ssh_files_to_import='
 		ssh/sshd_config
@@ -1321,7 +1323,8 @@ _OpenBSD_import_ssh_authorized_keys() {
 		ssh "$target" test -f "$authorized_keys" || continue
 		mkdir -p "nodes/$target/ssh/"
 		echo >&2 "--> Importing $authorized_keys"
-		_import_copy "root@$target:$authorized_keys" "nodes/$target/ssh/authorized_keys_$user"
+		#_import_copy "root@$target:$authorized_keys" "nodes/$target/ssh/authorized_keys_$user"
+		scp "root@$target:$authorized_keys" "nodes/$target/ssh/authorized_keys_$user"
 	done
 }
 
blob - b2d065677286e23033305d0fa9182dff85fec0d6
blob + 28ef05b4a5f7089ad1557b5c03c633f3033cc66b
--- r7.1
+++ r7.1
@@ -1,7 +1,7 @@
 '\" t
 .\" Automatically generated by Pandoc 3.6.2
 .\"
-.TH "R7" "1" "Tue Jun 3 2025" "v0.1.1" "User Manual"
+.TH "R7" "1" "Tue Jun 3 2025" "v0.1.2" "User Manual"
 .SS Tutorial
 .SS Introduction
 R7 is a configuration management framework made to configure nodes with
@@ -1460,6 +1460,18 @@ The HTML output is a work in progress.
 .PP
    *   *   *   *   *
 .SS License
+The provided group library is shared as additionnal examples of the
+documentation and contain the following third\-party files under the ISC
+License.
+Copyright information are indicated in the LICENSE section of related
+files.
+.IP \[bu] 2
+\f[CR]pf\-badhost.sh\f[R]
+.IP \[bu] 2
+\f[CR]unbound\-adblock.sh\f[R]
+.IP \[bu] 2
+\f[CR]http\-ban.sh\f[R]
+.PP
 The project is shared under the terms of the ISC license.
 Any version previous \f[CR]0.1.0\f[R] needs to be considered obsolete
 and should not be redistributed.