Skip to content
This repository has been archived by the owner on Nov 26, 2022. It is now read-only.

Add environment variables (for both Apache and Nginx) #38

Merged
merged 12 commits into from
Mar 27, 2020

Conversation

zugao
Copy link
Contributor

@zugao zugao commented Mar 10, 2020

Refactored Apache and Nginx images. Added various ENV variables for modsecurity, apache and nginx in order to make the images easier to use out of the box.

Notes for reviewer

Some files have only whitespace changes (conversion of line endings); you may want to activate the "Hide whitespace changes" option.

Known issues

The request headers X-Real-IP, X-Forwarded-For, X-Forwarded-Port, X-Forwarded-Proto are removed in Nginx (or their values blanked) before the request is passed to the $BACKEND via proxy_pass $upstream;

Hence the external behavior is not 100% guaranteed to be identical across the two webproxy flavors (Apache, Nginx), as far as the request headers on the backend are concerned. This is a very tricky, stubborn technical problem. I'll open an issue to follow up on that.

@zugao zugao requested review from bittner and srueg March 10, 2020 07:46
v2-apache/conf/extra/httpd-ssl.conf Outdated Show resolved Hide resolved
v2-apache/Dockerfile Outdated Show resolved Hide resolved
@zugao zugao force-pushed the feature/add-env-vars branch 3 times, most recently from 1b928fd to 57a9315 Compare March 10, 2020 17:11
README.md Outdated Show resolved Hide resolved
v2-apache/Dockerfile Outdated Show resolved Hide resolved
v3-nginx/docker-entrypoint.sh Outdated Show resolved Hide resolved
v3-nginx/nginx.conf Outdated Show resolved Hide resolved
v3-nginx/nginx.conf Outdated Show resolved Hide resolved
@bittner bittner force-pushed the feature/add-env-vars branch 3 times, most recently from 6b3df87 to d429fd1 Compare March 19, 2020 17:02
@bittner bittner changed the title Feature/add env vars Add environment variables (Apache, Nginx) Mar 20, 2020
@bittner bittner marked this pull request as ready for review March 20, 2020 15:47
@bittner bittner requested review from srueg, a team and bittner and removed request for bittner March 20, 2020 15:53
README.md Outdated Show resolved Hide resolved
@bittner bittner changed the title Add environment variables (Apache, Nginx) Add environment variables (for both Apache and Nginx) Mar 20, 2020
v3-nginx/conf.d/default.conf Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
docker-compose.yml Show resolved Hide resolved
@fzipi
Copy link
Member

fzipi commented Mar 26, 2020

LGTM also. Nice work!

Add /healthz and /metrics endpoints to Nginx setup

Harmonize variable naming across Apache and Nginx
@bittner bittner requested a review from srueg March 26, 2020 20:10
@bittner bittner merged commit 779f85a into master Mar 27, 2020
@bittner bittner deleted the feature/add-env-vars branch March 27, 2020 16:28
@fzipi
Copy link
Member

fzipi commented Mar 27, 2020

@bittner Amazing job!

@bittner
Copy link
Contributor

bittner commented Mar 27, 2020

Thanks! 👍

There's still a lot left to do. But yeah, one step after the other.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants