giles
/
stack
Archived
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matomo as a sub path
continuous-integration/drone/push Build was killed Details

This commit is contained in:
Giles Bradshaw 2020-05-05 12:06:42 +01:00
parent a8e64dcab2
commit fe2be7b23e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker-compose.yml
View File

@ -13,7 +13,7 @@ services:
environment: environment:
- CERTBOT_EMAIL=${CERTBOT_EMAIL} - CERTBOT_EMAIL=${CERTBOT_EMAIL}
- SERVER_NAME=${GIT_DOMAIN} - SERVER_NAME=${GIT_DOMAIN}
- PROXY_PASS=http://gitea:3000/ - GIT_PROXY_PASS=http://gitea:3000/
- BLOG_PROXY_PASS=http://ghost:2368/ - BLOG_PROXY_PASS=http://ghost:2368/
- CHAT_PROXY_PASS=http://chat:3000/ - CHAT_PROXY_PASS=http://chat:3000/
- COMMENTO_PROXY_PASS=http://commento:8080/ - COMMENTO_PROXY_PASS=http://commento:8080/
@ -23,6 +23,7 @@ services:
- PORTAINER_PROXY_PASS=http://portainer:9000/ - PORTAINER_PROXY_PASS=http://portainer:9000/
- PORTAINER_LOCATION=/portainer/ - PORTAINER_LOCATION=/portainer/
- MATOMO_PROXY_PASS=http://matomo-web/ - MATOMO_PROXY_PASS=http://matomo-web/
- MATOMO_LOCATION=/analytics/
- GIT_LOCATION=/git/ - GIT_LOCATION=/git/
- BLOG_LOCATION=/ - BLOG_LOCATION=/
- CHAT_LOCATION=/chat/ - CHAT_LOCATION=/chat/

8
letsencrypt-nginx/conf/git.conf
View File

@ -148,9 +148,15 @@ server {
location ~ ${GIT_LOCATION}(.*) { location ~ ${GIT_LOCATION}(.*) {
resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns 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; 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(.*) { location ~ ${CHAT_LOCATION}sockjs(.*) {
resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns 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; set ${DOLLAR}upstream ${CHAT_PROXY_PASS}chat/sockjs${DOLLAR}1${DOLLAR}is_args${DOLLAR}args;