mrrl-system-config

commit 06a8995fba7045002a1537670d263098b105d844
parent 64d07bae7c3c7aa6535b053395faa023c7d386df
Author: ccx <ccx@te2000.cz>
Date:   Thu,  7 Mar 2024 17:34:12 +0000

conf -> config

Diffstat:
M
Makefile
 | 
2
+-
M
config/etc/ssh/sshd_config
 | 
2
+-
R
authorized_keys/ccx -> keys/ssh/authorized_keys/ccx
 | 
0

R
authorized_keys/root -> keys/ssh/authorized_keys/root
 | 
0

M
s6-rc.aat
 | 
2
+-

5 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
@@ -60,7 +60,7 @@ build/postinstall.gen.fileset:
 	sed <build/config.dirs >'$@.new' -Ee \
 		's|.*|/&\t+\td|'
 	sed <build/config.files >'$@.new' -Ee \
-		's|.*|/&\t+\tlf!\t$(CURRENT)/conf/&|'
+		's|.*|/&\t+\tlf!\t$(CURRENT)/config/&|'
 	rm build/config.dirs build/config.files
 	mv '$@.new' '$@'
 
diff --git a/config/etc/ssh/sshd_config b/config/etc/ssh/sshd_config
@@ -38,7 +38,7 @@ PermitRootLogin prohibit-password
 
 # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
 # but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile	/current/conf/authorized_keys/%u  .ssh/authorized_keys
+AuthorizedKeysFile	/current/keys/ssh/authorized_keys/%u  .ssh/authorized_keys
 
 #AuthorizedPrincipalsFile none
 
diff --git a/authorized_keys/ccx b/keys/ssh/authorized_keys/ccx
diff --git a/authorized_keys/root b/keys/ssh/authorized_keys/root
diff --git a/s6-rc.aat b/s6-rc.aat
@@ -128,7 +128,7 @@
 |start_oneshot("cgroups", "mount-run-cgroup")
 |in_bundle("ok-sysinit")
 |up()
-	cgconfigparser -l /current/conf/etc/cgconfig.conf
+	cgconfigparser -l /current/config/etc/cgconfig.conf
 |end()
 
 |start_oneshot("mdevd-coldplug", "mount-dev mount-sys modules mdevd")