x
/
bansho
Code Issues Proposed changes

Merge "Surveil - New default port: 5311"

This commit is contained in:
Jenkins 2015-07-03 18:22:22 +00:00 committed by Gerrit Code Review
parent 2cfcd16c0b 035b27ef73
commit a8f5dc491a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -34,8 +34,8 @@ ADD /app /opt/bansho/app
# Override those variables at runtime to point Bansho to another backend
ENV BANSHO_PROD true
ENV BANSHO_SURVEIL_URL http://surveil:8080/
ENV BANSHO_AUTH_URL http://surveil:8080/v2/auth/
ENV BANSHO_SURVEIL_URL http://surveil:5311/
ENV BANSHO_AUTH_URL http://surveil:5311/v2/auth/
ENV INFLUXDB_HOST influxdb
ENV INFLUXDB_PORT 8086

8
container/000-default.conf
View File

@ -9,11 +9,11 @@
ProxyPreserveHost On
ProxyPass /surveil/v2/auth/ http://surveil:8080/v2/auth/
ProxyPassReverse /surveil/v2/auth/ http://surveil:8080/v2/auth/
ProxyPass /surveil/v2/auth/ http://surveil:5311/v2/auth/
ProxyPassReverse /surveil/v2/auth/ http://surveil:5311/v2/auth/
ProxyPass /surveil/ http://surveil:8080/
ProxyPassReverse /surveil/ http://surveil:8080/
ProxyPass /surveil/ http://surveil:5311/
ProxyPassReverse /surveil/ http://surveil:5311/
RequestHeader set GRAFANA-USER "admin"
ProxyPass /grafana/ http://grafana:80/