(FM-7605) - Disabling conf_enabled on Ubuntu 18.04 by default as it conflicts with Shibboleth causing errors with apache2. #1856
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
|
|
manifests/params.pp
Outdated
| @@ -218,7 +218,11 @@ | |||
| $server_root = '/etc/apache2' | |||
| $conf_dir = $httpd_dir | |||
| $confd_dir = "${httpd_dir}/conf.d" | |||
| $conf_enabled = "${httpd_dir}/conf-enabled" | |||
| if !($::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '18.04') { | |||
There was a problem hiding this comment.
This should be moved to the Ubuntu18 specific params section further down.
eimlav
reviewed
Dec 6, 2018
ekohl
reviewed
Dec 6, 2018
|
@HelenCampbell @eimlav Code is update |
david22swan
force-pushed
the
ub18_fix
branch
2 times, most recently
from
39f216b to
a4c3b93
Compare
pmcmaw
changed the title
…flicts with Shibboleth, causing errors with apache2
|
Have moved the exclusion to its previous location as the new one caused unit test failures. |
|
@ekohl Are you happy with the code as it is now?? |
ekohl
approved these changes
Dec 10, 2018
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.
No description provided.