Commit 820b4db5 authored by jackie / Andrea Ida Malkah Klaura's avatar jackie / Andrea Ida Malkah Klaura
Browse files

update container-config files

parent 31e03d5d
......@@ -8,6 +8,9 @@ server {
}
location /openid/ {
proxy_pass http://steering-django:8000/openid/;
proxy_redirect $scheme://$host/oidc_callback.html /oidc_callback.html;
proxy_redirect ~^/?(.*)$ $scheme://$host:$server_port/steering/$1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
......@@ -28,6 +31,7 @@ server {
proxy_set_header X-Forwarded-Port $server_port;
proxy_pass http://steering-django:8000/;
proxy_redirect $scheme://$host/ /;
proxy_redirect ~^/?(.*)$ $scheme://$host:$server_port/steering/$1;
sub_filter 'href="/' 'href="/steering/';
......@@ -35,12 +39,12 @@ server {
sub_filter 'action="/' 'action="/steering/';
sub_filter_once off;
}
#location /tank/ {
# proxy_buffering off;
# proxy_ignore_headers "X-Accel-Buffering";
# proxy_request_buffering off;
# proxy_http_version 1.1;
location /tank/ {
proxy_buffering off;
proxy_ignore_headers "X-Accel-Buffering";
proxy_request_buffering off;
proxy_http_version 1.1;
# proxy_pass http://tank:8040/;
#}
proxy_pass http://tank:8040/;
}
}
\ No newline at end of file
......@@ -7,53 +7,45 @@ store:
type: postgres
host: "${TANK_DB_HOST}"
tls: disable
username: "${TANK_DB_USERNAME}"
password: "${TANK_DB_PASSWORD}"
database: "${TANK_DB_NAME}"
importer:
temp-path: "${TANK_IMPORTER_TEMP_PATH}"
workers: 4
normalizer: ffmpeg
auth:
sessions:
## defaults to 24h
max-age: 12h
oidc:
issuer-url: http://steering-django:8000/openid
login-timeout: 10m # defaults to 5 Minutes
# These values have to be overwritten after steering setup
#issuer-url: http://steering-django:8000/openid
#client-id: 123456
#client-secret: abcdef1234567890
#callback-url: https://tank:8400/auth/oidc/callback
#login-timeout: 10m # defaults to 5 Minutes
issuer-url: http://steering-django:8000/openid
client-id: 935527
client-secret: 4PjvlQOxw7FQnKA04fKWmPHnUlXQtzmE
callback-url: http://aura-local/tank/auth/oidc/callback
login-timeout: 10m # defaults to 5 Minutes
client-id: "113851"
client-secret: KTMgoBd9Qr7MQsUWjh0B3mlmqOvhhjGD
callback-url: http://aura.local/tank/auth/oidc/callback
web:
### one of stdout, stderr, file:/path/to/access.log
#access-logs: /var/log/tank.access.log
access-logs: stdout
#base-url: /tank/
debug-ui:
enabled: false
### uncomment to enable CORS headers
### see: https://godoc.org/github.com/rs/cors#Options
#cors:
# allowed-origins: ['http://aura-test.o94.at']
# allowed-methods:
# - GET
# - PUT
# - POST
# - PATCH
# - DELETE
# allowed-headers: ['Authorization', 'Content-Type']
# allow-credentials: true
# debug: true
### uncomment to enable CORS headers
### see: https://godoc.org/github.com/rs/cors#Options
#cors:
# allowed-origins: ['http://aura-test.o94.at']
# allowed-methods:
# - GET
# - PUT
# - POST
# - PATCH
# - DELETE
# allowed-headers: ['Authorization', 'Content-Type']
# allow-credentials: true
# debug: true
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment