Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move ssh configs to coreos-base/misc-files package in our overlay #98

Merged
merged 1 commit into from
Sep 29, 2023

Conversation

krnowak
Copy link
Member

@krnowak krnowak commented Jun 22, 2023

The ssh and sshd configuration in Gentoo has been changed from a single file thing to a single file config including configuration snippets in /etc/ssh{,d}_config.d/ directory. We will ride on this change and turn our ssh configs into such snippets. But these will be installed by a different package directly into /etc/ssh directory. This makes the tmpfiles config file creating symlinks for ssh configs unnecessary, so drop it too.

@@ -1,17 +0,0 @@
# Use most defaults for sshd configuration.
Copy link
Member

@pothos pothos Jun 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of re-adding this through the misc package, could we change the install directive to put it into /etc (but I guess it's a taste question of either having files in a repo like here or under the files/ ebuild subfolder).

I think we also need one of those compat symlinks for /usr/share/ssh/ssh(d)_config to point to the file under /usr/share/flatcar/etc or something like that. The old symlink for existing installations could stick around and thus require that target to be present.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of re-adding this through the misc package, could we change the install directive to put it into /etc (but I guess it's a taste question of either having files in a repo like here or under the files/ ebuild subfolder).

Yeah, my opinion was that this repo is no place for ssh configs, Thus the move.

I think we also need one of those compat symlinks for /usr/share/ssh/ssh(d)_config to point to the file under /usr/share/flatcar/etc or something like that. The old symlink for existing installations could stick around and thus require that target to be present.

These are done by coreos-base/misc-files in the scripts PR.

@krnowak krnowak marked this pull request as ready for review September 29, 2023 05:40
@krnowak krnowak requested review from pothos and a team September 29, 2023 05:40
@krnowak
Copy link
Member Author

krnowak commented Sep 29, 2023

This will be pulled into image as a part of flatcar/scripts#945.

The ssh and sshd configuration in Gentoo has been changed from a
single file thing to a single file config including configuration
snippets in /etc/ssh{,d}_config.d/ directory. We will ride on this
change and turn our ssh configs into such snippets. But these will be
installed by a different package directly into /etc/ssh
directory. This makes the tmpfiles config file creating symlinks for
ssh configs unnecessary, so drop it too.
@krnowak krnowak merged commit 22c07b1 into flatcar-master Sep 29, 2023
@krnowak krnowak deleted the krnowak/ssh-config branch September 29, 2023 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants