Fixes #32947 - Use Apache module variables #968
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
evgeni
approved these changes
Jul 6, 2021
evgeni
reviewed
Jul 6, 2021
| @@ -3,7 +3,7 @@ | |||
| SSLRequireSSL | |||
| AuthType GSSAPI | |||
| AuthName "GSSAPI Single Sign On Login" | |||
| GssapiCredStore keytab:<%= scope.lookupvar('foreman::http_keytab') %> | |||
| GssapiCredStore keytab:<%= @http_keytab %> | |||
There was a problem hiding this comment.
I was about to say that this should have broken
But we don't test this on Debian at all…
Mind adding tests? :)
There was a problem hiding this comment.
I took the liberty of pushing some simple tests now ;)
Apache is packaged in different locations between Red Hat and Debian. The user differs (apache vs www-data) and conf dir (/etc/httpd vs /etc/apache2). This changes the code to use variables already defined on the apache module to avoid duplicating this logic.
evgeni
force-pushed
the
32947-use-apache-vars
branch
from
6b08717
to
f9cafdc
Compare
|
I can't approve my own PR, but 👍 and thanks for fixing the tests. |
|
@tbrisker how noteworthy do you find that Debian can now use Kerberos auth too? :) |
|
Perhaps we can capture it together in "Kerberos is now available on EL8 and Debian" |
|
Makes sense to add a headline feature regarding the switch to gssapi and its availability on all distros |
|
and now i see you already did that ^_^ |
|
Yupp. And now also explicitly added Debian/Ubuntu in theforeman/theforeman.org#1858 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Apache is packaged in different locations between Red Hat and Debian. The user differs (apache vs www-data) and conf dir (/etc/httpd vs /etc/apache2). This changes the code to use variables already defined on the apache module to avoid duplicating this logic.