Drop all internal SSL #197
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
carbonin
reviewed
Aug 16, 2017
images/miq-app-frontend/Dockerfile
Outdated
| yum clean all | ||
|
|
||
| ## GIT clone service UI repo (SUI) | ||
| RUN mkdir -p ${SUI_ROOT} && \ | ||
| curl -L https://github.com/ManageIQ/manageiq-ui-service/tarball/${REF} | tar vxz -C ${SUI_ROOT} --strip 1 | ||
|
|
||
| ## Setup environment | ||
| RUN mv /etc/httpd/conf.d/ssl.conf{,.orig} && \ | ||
| echo "# This file intentionally left blank. ManageIQ maintains its own SSL configuration" > /etc/httpd/conf.d/ssl.conf | ||
| RUN rm /etc/httpd/conf.d/ssl.conf && \ |
carbonin
reviewed
Aug 16, 2017
| # HTTP Start-up error log | ||
| ErrorLog /var/www/miq/vmdb/log/apache/miq_apache.log | ||
|
|
||
| # Disable this section if using HTTP only |
There was a problem hiding this comment.
We are using HTTP only here right? Not sure what this applies to.
carbonin
reviewed
Aug 16, 2017
| DocumentRoot /var/www/miq/vmdb/public | ||
| Include conf.d/manageiq-redirects-ui | ||
| Include conf.d/manageiq-redirects-ws | ||
| Include conf.d/manageiq-redirects-websocket |
There was a problem hiding this comment.
I think we will probably still need cockpit here right?
I'm not sure if they are all tested in containers, but I think that's what #97 is meant to address, so maybe we can investigate in a followup?
- Move SSL to the route - Drop extra httpd modules - Don't generate certificates - No need to pass the MANAGEIQ_SERVICE_NAME to the httpd container
|
Checked commit bdunne@e0b9b6c with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0 |
carbonin
reviewed
Aug 16, 2017
|
@bdunne will take care of the readme in a followup. Going to merge now so @abellotti can rebase on these changes. |
carbonin
approved these changes
Aug 16, 2017
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.
Must be merged at the same time as ManageIQ/container-httpd#11