diff --git a/docker-compose.yml b/docker-compose.yml index 008ce97..b7e7645 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: environment: - CERTBOT_EMAIL=${CERTBOT_EMAIL} - SERVER_NAME=${GIT_DOMAIN} - - PROXY_PASS=http://gitea:3000/ + - GIT_PROXY_PASS=http://gitea:3000/ - BLOG_PROXY_PASS=http://ghost:2368/ - CHAT_PROXY_PASS=http://chat:3000/ - COMMENTO_PROXY_PASS=http://commento:8080/ @@ -23,6 +23,7 @@ services: - PORTAINER_PROXY_PASS=http://portainer:9000/ - PORTAINER_LOCATION=/portainer/ - MATOMO_PROXY_PASS=http://matomo-web/ + - MATOMO_LOCATION=/analytics/ - GIT_LOCATION=/git/ - BLOG_LOCATION=/ - CHAT_LOCATION=/chat/ diff --git a/letsencrypt-nginx/conf/git.conf b/letsencrypt-nginx/conf/git.conf index 1af3be6..2daca6f 100644 --- a/letsencrypt-nginx/conf/git.conf +++ b/letsencrypt-nginx/conf/git.conf @@ -148,9 +148,15 @@ server { location ~ ${GIT_LOCATION}(.*) { resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns - set ${DOLLAR}upstream ${PROXY_PASS}${DOLLAR}1${DOLLAR}is_args${DOLLAR}args; + set ${DOLLAR}upstream ${GIT_PROXY_PASS}${DOLLAR}1${DOLLAR}is_args${DOLLAR}args; proxy_pass ${DOLLAR}upstream; } + location ~ ${MATOMO_LOCATION}(.*) { + resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns + set ${DOLLAR}upstream ${MATOMO_PROXY_PASS}${DOLLAR}1${DOLLAR}is_args${DOLLAR}args; + proxy_pass ${DOLLAR}upstream; + } + location ~ ${CHAT_LOCATION}sockjs(.*) { resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns set ${DOLLAR}upstream ${CHAT_PROXY_PASS}chat/sockjs${DOLLAR}1${DOLLAR}is_args${DOLLAR}args;