diff --git a/profiles/templates/2_ac_install_merge/net-misc/openssh/include.conf b/profiles/templates/2_ac_install_merge/net-misc/openssh/include.conf new file mode 100644 index 000000000..6e7a4e94f --- /dev/null +++ b/profiles/templates/2_ac_install_merge/net-misc/openssh/include.conf @@ -0,0 +1,2 @@ +# Calculate path=/etc/ssh name=sshd_config grep(/etc/ssh/sshd_config,/etc/ssh/sshd_config.d)== append=after +Include "/etc/ssh/sshd_config.d/*.conf" diff --git a/profiles/templates/6_ac_update_sync/remerge/0-ini b/profiles/templates/6_ac_update_sync/remerge/0-ini index 099cedd5a..c44ee8152 100644 --- a/profiles/templates/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/6_ac_update_sync/remerge/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 -remerge = 20230523 +remerge = 20230525 diff --git a/profiles/templates/6_ac_update_sync/remerge/2023/20230523 b/profiles/templates/6_ac_update_sync/remerge/2023/20230525 similarity index 100% rename from profiles/templates/6_ac_update_sync/remerge/2023/20230523 rename to profiles/templates/6_ac_update_sync/remerge/2023/20230525