-
Notifications
You must be signed in to change notification settings - Fork 297
feat(TOFS): ssh sshd configs known_host and banner #164
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to copy from template-formula the TOFS doc.
Otherwise LGTM, good job :)
|
@sticky-note These TOFS PRs need to be checked thoroughly, in a similar way that has been done for the other two TOFS PRs we've worked on:
Could you please provide this output for this PR? |
Added |
|
@myii, Here is my output for this PR:
|
|
@sticky-note Apologies for the delay. Thanks for this PR, I've done most of the checks and it's generally fine. I've got some comments but I will need to come back to this when I've got some more time available. |
* Use consistent Jinja whitespace control `{%- ... -}`
* Improve debug output (comments & whitespace control)
* Use exact state names with TOFS `files_switch`
* Add `ssh_known_hosts_src` to `defaults` (for consistency)
* Restrict `pillar.example` changes to TOFS only
* Use `fire_banner` in `pillar.example` to indicate available template
|
@sticky-note So now it's time for me to turn the tables on you -- it's your turn to review my changes! See the commit that I've added here (f6dbca3). Here's my explanation about what I'm proposing:
Feel free to agree or disagree. I can explain further if necessary. I look forward to your advice. Note, if all is OK, nothing else needs to be done from your side. The merge can proceed as usual. |
|
For completeness, the diff of changes before and after this PR (after the last commit added). openssh.banner (non-TOFS)
openssh.banner (TOFS)- - salt://openssh/files/banner
+ - salt://openssh/files/ABC/banner
+ - salt://openssh/files/Debian/banner
+ - salt://openssh/files/default/banneropenssh.config (non-TOFS)
openssh.config (TOFS)- - salt://openssh/files/sshd_config
+ - salt://openssh/files/ABC/sshd_config
+ - salt://openssh/files/Debian/sshd_config
+ - salt://openssh/files/default/sshd_config
...
- - salt://openssh/files/ssh_config
+ - salt://openssh/files/ABC/ssh_config
+ - salt://openssh/files/Debian/ssh_config
+ - salt://openssh/files/default/ssh_configopenssh.known_hosts- - salt://openssh/files/ssh_known_hosts
+ - salt://openssh/files/ABC/ssh_known_hosts
+ - salt://openssh/files/Debian/ssh_known_hosts
+ - salt://openssh/files/default/ssh_known_hosts |
|
It looks more consistent |
|
Merged, thanks for the excellent work and patience, @sticky-note! |
Here is a contribution to openssh-formula.
Don't know how to handle source filenames here, so I decided to keep backward compatibility.
What do you think about it ?
Ping @myii