openssh settings moved to /etc/ssh/sshd_config.d/

profiles/templates/2_ac_install_merge/net-misc/openssh/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate mergepkg()!= name=etc
+# Calculate mergepkg()!= append=skip
 

profiles/templates/2_ac_install_merge/net-misc/openssh/calculate.conf

@@ -0,0 +1,4 @@
+# Calculate format=squid path=/etc/ssh/sshd_config.d
+DenyUsers guest
+PermitRootLogin yes
+Subsystem sftp /usr/lib64/misc/sftp-server

profiles/templates/2_ac_install_merge/net-misc/openssh/migrate-to-sshd_config.d

@@ -0,0 +1,5 @@
+# Calculate format=patch path=/etc/ssh name=sshd_config
+<reg>\nDenyUsers guest</reg>
+<text></text>
+<reg>\nSubsystem sftp /usr/lib64/misc/sftp-server</reg>
+<text></text>

profiles/templates/2_ac_install_merge/net-misc/openssh/restart-openssh

@@ -1,8 +1,8 @@
-# Calculate run=/bin/bash pkg(net-misc/openssh)>=8.4_p1&&ini(merge.openssh)==
+# Calculate run=/bin/bash pkg(net-misc/openssh)!=&&ini(merge.openssh)==
 
 #-ini(merge.openssh,8.4)-#
 
 #?ac_install_disk==off&&cl_chroot_status==off#
-( /etc/init.d/sshd status && /etc/init.d/sshd restart ) &>/dev/null
+rc-service -sq sshd restart
 #ac_install_disk#
 exit 0

profiles/templates/2_ac_install_merge/net-misc/openssh/ssh/sshd_config

@@ -1,7 +0,0 @@
-# Calculate format=squid
-DenyUsers guest
-#?os_install_arch_machine==x86_64#
-Subsystem sftp /usr/lib64/misc/sftp-server
-#!os_install_arch_machine#
-Subsystem sftp /usr/lib/misc/sftp-server
-#os_install_arch_machine#

profiles/templates/2_ac_install_merge/net-misc/openssh/ssh/sshd_config.root_permit

@@ -1,5 +0,0 @@
-# Calculate format=patch name=sshd_config
-<reg>\n.*[^"]PermitRootLogin.*</reg>
-<text></text>
-<reg>\nUsePAM</reg>
-<text>\nPermitRootLogin yes\nUsePAM</text>

profiles/templates/6_ac_update_sync/revision/0-ini

@@ -2,4 +2,4 @@
 
 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-revision = 20230406
+revision = 20230523

profiles/templates/6_ac_update_sync/revision/2023/20230523-fix_sshd

@@ -0,0 +1,3 @@
+# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0)-# rebuild=net-misc/openssh
+
+#-ini(overlay-calculate.revision,#-cut(0)-#)-#