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

fix: Review and update service units and socket unit to include distribution defaults #267

Merged
merged 6 commits into from
Jan 25, 2024

Conversation

Jakuje
Copy link
Collaborator

@Jakuje Jakuje commented Oct 30, 2023

Enhancement: Update systemd units to reflect OS defaults

Reason: The systemd units were based on some old ubuntu/debian and never updated to match current versions.

Result: The generated units include all important system defaults

Issue Tracker Tickets (Jira or BZ if any): -

@Jakuje Jakuje force-pushed the runtime branch 4 times, most recently from fe17829 to 91a2770 Compare October 31, 2023 14:37
@Jakuje Jakuje changed the title WIP: fix: Review and update service units and socket unit to include distribution defaults fix: Review and update service units and socket unit to include distribution defaults Oct 31, 2023
@Jakuje Jakuje force-pushed the runtime branch 2 times, most recently from 1351d2e to 2e3e67f Compare November 27, 2023 13:22
vars/main.yml Outdated Show resolved Hide resolved
templates/sshd.socket.j2 Outdated Show resolved Hide resolved
@Jakuje
Copy link
Collaborator Author

Jakuje commented Jan 22, 2024

@richm @mattwillsher is this ready to merge or is there some more work needed and I should pull the changes fixing CI into separate PR?

@mattwillsher
Copy link
Member

Looks ok to me from a cursory review

templates/sshd.service.j2 Outdated Show resolved Hide resolved
@richm
Copy link
Collaborator

richm commented Jan 22, 2024

I guess ansible-lint still has the bug where it will not check multiline when for Jinja spacing . . .

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Specifics:
 * Debian 12 has no longer the instantiated service using inet, see the
   following commit:

https://salsa.debian.org/ssh-team/openssh/-/commit/0dc73888bbfc17fae04b891ac0c80f35f9c44f48

 * I am not matching the Description tag verbosely as I do not find it
   crucial for functionality.
 * We generate additional -f switch to the sshd CLI pointing go the main
   sshd config we manage
 * The Before=sshd.service in the socket is not generated as I find it
   unnecessary when we conflict the service.
 * Recent Ubuntu versions have RuntimeDirectoryPreserve option, which I
   set for all Ubuntu/Debian as it should not hurt.

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
…nt options

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
@Jakuje
Copy link
Collaborator Author

Jakuje commented Jan 22, 2024

So it looks like its final, green and ready to merge, unless there will be some more comments.

I did similar change regarding the After keyword also in the instantiated service file.

@richm
Copy link
Collaborator

richm commented Jan 22, 2024

So it looks like its final, green and ready to merge, unless there will be some more comments.

I did similar change regarding the After keyword also in the instantiated service file.

ok - still lgtm

@richm
Copy link
Collaborator

richm commented Jan 25, 2024

ready to merge?

@Jakuje
Copy link
Collaborator Author

Jakuje commented Jan 25, 2024 via email

@richm richm merged commit cb8c339 into willshersystems:main Jan 25, 2024
16 checks passed
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.

None yet

3 participants