From 131fe0d189f99cece418281c3b2aaad35655e93a Mon Sep 17 00:00:00 2001 From: barry Date: Fri, 7 Jun 2019 16:13:17 +0200 Subject: [PATCH] url updated for eca --- srv/conf/conf.d/portal.conf | 2 +- srv/docker-compose.yml | 2 ++ srv/webapp/portal/index.html | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/srv/conf/conf.d/portal.conf b/srv/conf/conf.d/portal.conf index 2f3be98..94ab125 100755 --- a/srv/conf/conf.d/portal.conf +++ b/srv/conf/conf.d/portal.conf @@ -5,7 +5,7 @@ server { *.gstatic.com; location / { - proxy_pass http://portal_service:8889/; + proxy_pass http://pxportal_service:8889/; proxy_set_header Host $host; proxy_set_header X-Real-Ip $remote_addr; proxy_buffering off; diff --git a/srv/docker-compose.yml b/srv/docker-compose.yml index ffae3a8..9029022 100644 --- a/srv/docker-compose.yml +++ b/srv/docker-compose.yml @@ -24,6 +24,8 @@ services: - NET_ADMIN volumes: - ./conf/dnsmasq.conf:/etc/dnsmasq.conf + depends_on: + - pxportal pxportal: container_name: pxportal_service diff --git a/srv/webapp/portal/index.html b/srv/webapp/portal/index.html index 87d1ffd..69d0bba 100644 --- a/srv/webapp/portal/index.html +++ b/srv/webapp/portal/index.html @@ -122,7 +122,7 @@ var K_NB_TRY = 4 var K_HOME_URL = 'http://eca.aero' -var K_VALIDATE_URL = 'http://192.168.8.102:8889/validate' +var K_VALIDATE_URL = 'http://captive.eca.aero/validate' function submitAction () { sendValidate(0)