Correct template for apache 2.4 and use appropriate configuration directory #136
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
added 2 commits
June 10, 2016 15:33
…mmit adds conditionals so that the correct syntax can be used. A check for ubuntu version is also done in params.pp because the files were being placed in conf-enabled instead of conf.d on my Ubuntu 14.04 with Apache 2.4 setup. After these changes puppet board is usable.
juniorsysadmin
added
enhancement
|
Just a thought: It would be nice if you did a blanket conditional that accounted for all of the Ubuntu versions that use Apache 2.4 |
|
According to the Ubuntu release notes (https://wiki.ubuntu.com/TrustyTahr/ReleaseNotes) this switch happened at 14.04. 16.04 also has Apache 2.4 so at present it looks like we can safely say any version 14.04 or higher. |
|
@steveames are you able to rebase this and squash the commits? This should trigger it running against the new set of tests. I gave a quick pass to rebasing it myself, and the tests passed. Let us know on IRC or Slack if you need any help. |
|
Rebased / reworked in #189 |
bastelfreak
added a commit
that referenced
this pull request
Sep 24, 2017
Update to support Apache 2.4 - rework of #136
|
Hi @steveames, thanks for the contribution. we rebased and merged it in #189 |
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.
This fork modifies the templates/apache/conf.erb file to put conditionals around parts of the syntax to make it compatible with Apache 2.4.
Params is also modified so that (at least on Ubuntu 14.04 running Apache 2.4) it uses conf.d instead of conf-enabled. I don't know that other versions of Ubuntu use conf-enabled. I know this setup does not.