diff options
Diffstat (limited to 'dashboard/config')
| -rw-r--r-- | dashboard/config/nginx/pharos_dashboard.conf | 26 | ||||
| -rwxr-xr-x | dashboard/config/postgres/docker-entrypoint-initdb.d/pharos_dashboard.sh | 14 |
2 files changed, 13 insertions, 27 deletions
diff --git a/dashboard/config/nginx/pharos_dashboard.conf b/dashboard/config/nginx/pharos_dashboard.conf index 87b6f8e..6f32979 100644 --- a/dashboard/config/nginx/pharos_dashboard.conf +++ b/dashboard/config/nginx/pharos_dashboard.conf @@ -1,24 +1,24 @@ upstream web { - ip_hash; - server web:8000; + ip_hash; + server web:8000; } # portal -server { - listen 80; - server_name localhost; - charset utf-8; +server { + listen 80; + server_name localhost; + charset utf-8; - location /static { + location /static { alias /static; - } + } - location /media { + location /media { alias /media; - } + } - location / { + location / { proxy_set_header Host $host; - proxy_pass http://web/; - } + proxy_pass http://web/; + } } diff --git a/dashboard/config/postgres/docker-entrypoint-initdb.d/pharos_dashboard.sh b/dashboard/config/postgres/docker-entrypoint-initdb.d/pharos_dashboard.sh deleted file mode 100755 index 526228a..0000000 --- a/dashboard/config/postgres/docker-entrypoint-initdb.d/pharos_dashboard.sh +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################## -# Copyright (c) 2016 Max Breitenfeldt and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - -#!/bin/env bash - -psql -U postgres -c "CREATE USER $DB_USER PASSWORD '$DB_PASS'" -psql -U postgres -c "CREATE DATABASE $DB_NAME OWNER $DB_USER" |