diff --git a/docker-compose/.env b/docker-compose/.env index b7c36693..ae2fce7e 100644 --- a/docker-compose/.env +++ b/docker-compose/.env @@ -4,6 +4,7 @@ BUILDMASTER_URL=https://buildbot.mariadb.org/ MQ_ROUTER_URL=ws://localhost:8085/ws MASTER_PACKAGES_DIR="/mnt/autofs/master_packages" GALERA_PACKAGES_DIR="/mnt/autofs/galera_packages" -ARTIFACTS_URL="https://ci.mariadb.org" +NGINX_ARTIFACTS_VHOST="ci.mariadb.org" +ARTIFACTS_URL="https://$NGINX_ARTIFACTS_VHOST" ENVIRON="PROD" BRANCH="main" diff --git a/docker-compose/.env.dev b/docker-compose/.env.dev index 86cddde6..fe91ba0f 100644 --- a/docker-compose/.env.dev +++ b/docker-compose/.env.dev @@ -5,6 +5,7 @@ BUILDMASTER_WG_IP=100.64.101.1 MQ_ROUTER_URL=ws://crossbar:8080/ws MASTER_PACKAGES_DIR="/mnt/autofs/master_dev_packages" GALERA_PACKAGES_DIR="/mnt/autofs/galera_dev_packages" -ARTIFACTS_URL="https://ci.dev.mariadb.org" +NGINX_ARTIFACTS_VHOST="ci.dev.mariadb.org" +ARTIFACTS_URL="https://$NGINX_ARTIFACTS_VHOST" ENVIRON="DEV" BRANCH="dev" diff --git a/docker-compose/nginx/conf.d/ci.dev.mariadb.org.conf b/docker-compose/nginx/conf.d/ci.conf similarity index 79% rename from docker-compose/nginx/conf.d/ci.dev.mariadb.org.conf rename to docker-compose/nginx/conf.d/ci.conf index a8b12f1f..af748878 100644 --- a/docker-compose/nginx/conf.d/ci.dev.mariadb.org.conf +++ b/docker-compose/nginx/conf.d/ci.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name ci.dev.mariadb.org; + server_name $NGINX_ARTIFACTS_VHOST; root /srv/buildbot/packages/; autoindex on; @@ -18,4 +18,9 @@ server { location ~ mysqld\.[0-9]+\.err\.[0-9]+$ { add_header Content-Type text/plain; } + + # show some extensions directly in browser + types { + text/plain repo sources txt; + } }