Enable SSL support and refactor image sources #183
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
|
This addresses https://bugzilla.redhat.com/show_bug.cgi?id=1478556 btw. |
|
@remicollet WDYT? |
omron93
reviewed
Dec 15, 2017
| local dir=${1:-.} | ||
| if [ -d ${dir}/httpd-ssl/private ] && [ -d ${dir}/httpd-ssl/certs ]; then | ||
| echo "---> Looking for SSL certs for httpd..." | ||
| cp -r ${dir}/httpd-ssl ${HTTPD_APP_ROOT} |
There was a problem hiding this comment.
HTTPD_APP_ROOT is missing. (cause of CI failure)
There was a problem hiding this comment.
Thx, it's was a copy/paste issue, fixing it just now.
|
LGTM (quick look), as far as synced with httpd container change which have been merged. |
…ttpd Files are moved to non-opt directories, so they're same in SCL and non-SCL version SSL is installed, so apache can accept secured connections Variables used instead of hard-coded paths Allow to extend container by own configuration, including own SSL certificates
And use usage and maintainer labels consistently
|
[test-openshift] |
|
Thanks, merging. |
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 PR is a bit bigger than I originally hoped. There are basically these issues addressed here:
The most significant change is adding SSL feature -- by installing the module.
However, when running SSL server, user should be able to provide own SSL certificates, which is technically extending the image, so the general extendibility was also added as part of this PR, similar to what was already done in case of httpd container (https://github.com/sclorg/httpd-container/).
When working with configuration files, it turned to be pain to do it when those paths are hard-coded in scripts, while it also prevents it from sharing the same code across versions and platforms. Thus, I decided to also replace the hard-coded paths by variables defined in the Dockerfile. It allows to share the scripts better, makes it less error-prone for copy-paste errors and also allows to share scripts with Fedora based image.
As a proof for the last point, Fedora image is attached as part of this PR as well.