MDBF-804 - BB NGINX configuration in GH CI #590
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
About This Patch: - Using templates (present since NGINX 1.19) to populate conf.d. - Templates allow for the use of environment variables defined in the .env files, enabling us to distinguish between PROD and DEV environments, particularly for the server name and certificate paths. - A proxy_params file is required according to the PROD configuration. - Mounting /etc/letsencrypt/live for SSL certificates. The base path is the same in both environments. - NGINX_ARTIFACTS_SSL_PATH variable is necessary because, in DEV, the same certificate is used for both CI and BB. - Attaching net_back to the NGINX container to facilitate communication with master-web via DNS. - Removing net_front from master-web; communication will be handled through NGINX. - NGINX access/error logs are written to the Docker-Compose relative path logs/nginx, which is needed for Zabbix collection. TODO Before Migration to PROD: - Address all FIXME comments. - Cross-reference proxy pass - helper_files directory name on hz-bbm2. - location /cloud-init ? TODO Before Deployment in DEV: - Disable the HAProxy service.
RazvanLiviuVarzaru
force-pushed
the
feature/nginx-docker
branch
from
5a91862
to
6da2f1b
Compare
This will require some changes in Zabbix configuration for collecting these NGINX metrics. (replacing HAProxy metrics)
We don't have CrossReference in DEV, yet. For PROD I've configured the WG IP, for DEV it's just the loopback interface and will raise a BAD GATEWAY error.
RazvanLiviuVarzaru
force-pushed
the
feature/nginx-docker
branch
from
c4857d5
to
9f8f1bc
Compare
fauust
requested changes
Oct 14, 2024
docker-compose/docker-compose.yaml
Outdated
| - /srv/buildbot/packages:/srv/buildbot/packages:ro | ||
| - /srv/buildbot/galera_packages:/srv/buildbot/galera_packages:ro | ||
| - /srv/buildbot/helper_files:/srv/buildbot/helper_files:ro | ||
| - /etc/letsencrypt/live:/etc/nginx/ssl:ro |
There was a problem hiding this comment.
Let's add a comment here so that we make sure that we move this in /srv/buildbot (or somewhere else) when we move the renew routine from the host to containers.
| location /galera { | ||
| alias /srv/buildbot/galera_packages; | ||
| } | ||
| #FIX ME - Still needed? Not present in DEV. |
There was a problem hiding this comment.
Yes, but no, remove it and let's find another solution for cloud-init images, it's polluting and confusing.
|
|
||
| root /srv/buildbot/packages/; | ||
| location /helper_files { | ||
| alias /srv/buildbot/helper_files; #FIXME - for consistency, on hz-bbm2 let's rename it to helper_files instead of mariadb-shared-packages (current PROD) |
- add certbot container to docker-compose - bind mount www path for certbot/nginx to use it in webroot mode - bind mount certboot cnf path to allow nginx find the certificates Fixes: - remove location /cloud-init as per review - remove NGINX_ARTIFACTS_SSL_PATH variable . Will use multiple domain names in PROD also. - adapt bb and ci NGINX conf files to handle the acme challenge on port 80 - fix generate-config to avoid exposing nginx env variables to other containers other than nginx
RazvanLiviuVarzaru
force-pushed
the
feature/nginx-docker
branch
from
c82491b
to
4834fe4
Compare
fauust
added a commit
to fauust/buildbot
that referenced
this pull request
Oct 15, 2024
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.
About This Patch:
TODO Before Migration to PROD:
TODO Before Deployment in DEV:
standalonelike in DEV and in thepost_hookrestart the container?All the tests were performed locally (with just NGINX, MariaDB, Master-Web and CrossBar). (one can use a self-signed certificate)