-
Notifications
You must be signed in to change notification settings - Fork 49
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
144 rocky8 #178
144 rocky8 #178
Conversation
Fix bootstrap
Change version check
Thanks for your contribution. This passes tests and looks good to me - I assume it's working in your environment @minorOffense? I'm not currently using FreeRADIUS at the moment so I don't have a test platform. |
The service started with that in place yes on Rocky 8. I didn't test CentOS Stream or RHEL8. |
Thanks @minorOffense @nward or @amateo are either of you guys on CentOS/RHEL? I guess they're highly likely to be the same as Rocky 8, but you never know... 😄 |
I have an open question on #144:
@minorOffense Are you in a position to answer this? I am concerned that it could stop FreeRADIUS's default configuration starting if certs are never generated? |
I note that EL9 doesn't run bootstrap:
|
If we know the certs that bootstrap generate I’d add a series of file definitions to ensure present on those files. So the service doesn’t break on install. That’s what we did in our internal puppet code. An exec on bootstrap then register the files it generates. |
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.
Here's my thoughts, this looks good so far, nice work! I have a few tweaks suggested.
Do you want to have a stab at some tests for this? It would go in spec/classes/freeradius_spec.rb
, and check out spec/classes/radsniff_spec.rb
for some tests which run differently with different facts (osfamily in that case).
systemd::dropin_file { 'remove_bootstrap.conf': | ||
ensure => present, | ||
unit => 'radiusd.service', #@todo programmatically determine the service name | ||
content => template('freeradius/systemd_dropin_rhel8.erb'), | ||
} |
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.
Let's rename this to be unique and make the filename not RHEL8 specific, as this impacts any EL8 and maybe other distros too, perhaps something like:
systemd::dropin_file { 'remove_bootstrap.conf': | |
ensure => present, | |
unit => 'radiusd.service', #@todo programmatically determine the service name | |
content => template('freeradius/systemd_dropin_rhel8.erb'), | |
} | |
systemd::dropin_file { 'freeradius remove bootstrap': | |
filename => 'remove_bootstrap.conf', | |
ensure => present, | |
unit => 'radiusd.service', #@todo programmatically determine the service name | |
content => template('freeradius/systemd_dropin_remove_bootstrap.erb'), | |
} |
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.
Also - do you want to turn this todo in to an issue, I don't think we can solve that in this PR
[Service] | ||
ExecStartPre= | ||
ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd | ||
ExecStartPre=/usr/sbin/radiusd -C |
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.
As a style thing, can we add a newline at the end of this file and potentially update the filename
@@ -8,6 +8,10 @@ | |||
"project_page": "https://github.com/djjudas21/puppet-freeradius", | |||
"issues_url": "https://github.com/djjudas21/puppet-freeradius/issues", | |||
"dependencies": [ | |||
{ | |||
"name": "puppet/systemd", | |||
"version_requirement": ">=3.0.0 <4.0.0" |
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.
I think we need to be >=1.1.1
in order to get systemd::dropin_file
with the params we're using (filename
which I've suggested above is introduced in 1.1.1
, systemd::dropin_file
without it is in 1.0.0
). I don't know if we want to test all the way back there, but I think if we can support older we should, as some users will be on older versions of puppet/systemd
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.
Also note that camptocamp/systemd
is currently referenced here and in .fixtures.yml
, so we would need to remove/update those references and ensure this is compatible (from memory, camptocamp/systemd
became puppet/systemd
?)
I actually do have some real world licensed RHEL8 boxes, but not running FreeRADIUS :( I am happy with this being tested on Rocky8 - I'm all over those RPMs and they're all the same in this regard! |
We would appreciate to see this PR merged. Already tested it on a couple of Rocky Linux 8 boxes. |
Consensus seems to be that this works so it should be safe. @nward, you left some review comments last time you looked at it. Are you satisfied that they've been addressed? |
They don't appear to have been addressed. I have some day job work doing FreeRADIUS 3.2 on EL9 with Puppet over the next 2 weeks, so I'll tidy it up and do any further EL9 and FR3.2 changes, if there's no objection. |
I've made changes to resolve these issues here: https://github.com/djjudas21/puppet-freeradius/tree/144-rocky8 It looks like @minorOffense didn't allow maintainers to push to their branch - so I think the best approach is to close this, and create a new PR? |
Keen to get this merged - @nward and @minorOffense, please could you collaborate on this and hopefully we can get this merged and a new release tagged |
See #144