diff --git a/docker-compose.yml b/docker-compose.yml index 9b25cd0..b50894b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -435,8 +435,6 @@ services: platform: linux/amd64 container_name: perseus-web restart: always - volumes: - - ./perseus/web/server.docker.conf:/etc/nginx/server.docker.conf labels: - "traefik.enable=true" @@ -472,7 +470,7 @@ services: volumes: - ./perseus/backend/config.py:/app/config.py ports: - - "5000:5000" + - "5004:5004" #depends_on: # - perseus-shareddb # - perseus-files-manager diff --git a/perseus/backend/config.py b/perseus/backend/config.py index bf9b657..1e51131 100644 --- a/perseus/backend/config.py +++ b/perseus/backend/config.py @@ -1,4 +1,4 @@ -PORT = 5000 +PORT = 5004 APP_PREFIX = '/backend' VERSION = 0.4 diff --git a/perseus/web/server.docker.conf b/perseus/web/server.docker.conf deleted file mode 100644 index 84f5110..0000000 --- a/perseus/web/server.docker.conf +++ /dev/null @@ -1,135 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name _; - - - location / { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_pass http://172.17.0.1:4200; - # proxy_pass http://host.docker.internal:4200; - - } - - location /backend { - auth_request /user/api/is_token_valid_internal; - auth_request_set $username $upstream_http_Username; - proxy_set_header Username $username; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_pass http://172.17.0.1:5000; - } - - location /user { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_pass http://172.17.0.1:5001; - } - - location /user/api/is_token_valid_internal { - if ($request_uri ~ .*\/api\/info$) { - return 200; - } - if ($request_method = 'OPTIONS') { - return 200; - } - internal; - proxy_pass_request_body off; - proxy_set_header Content-Length ""; - proxy_set_header X-Original-URI $request_uri; - proxy_pass http://172.17.0.1:5001; - - proxy_cache token_responses; - proxy_cache_key $http_Authorization; - proxy_cache_lock on; - proxy_cache_valid 200 300s; - proxy_cache_use_stale error timeout; - } - - location /white-rabbit { - auth_request /user/api/is_token_valid_internal; - auth_request_set $username $upstream_http_Username; - proxy_set_header Username $username; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_pass http://172.17.0.1:8000; - } - - location /cdm-builder { - auth_request /user/api/is_token_valid_internal; - auth_request_set $username $upstream_http_Username; - proxy_set_header Username $username; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_pass http://172.17.0.1:9000; - } - - location /data-quality-dashboard/api { - auth_request /user/api/is_token_valid_internal; - auth_request_set $username $upstream_http_Username; - proxy_set_header Username $username; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_pass http://172.17.0.1:8001; - } - - location /data-quality-dashboard { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_pass http://172.17.0.1:8001; - } - - location /athena { - auth_request /user/api/is_token_valid_internal; - auth_request_set $username $upstream_http_Username; - proxy_set_header Username $username; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_pass http://172.17.0.1:5002; - } - - location /solr { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_pass http://172.17.0.1:8983; - #include /etc/nginx/whitelist.conf; - } - - location /usagi { - auth_request /user/api/is_token_valid_internal; - auth_request_set $username $upstream_http_Username; - proxy_set_header Username $username; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_pass http://172.17.0.1:5003; - } - - location /swagger { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_pass http://172.17.0.1:8080; - } -} \ No newline at end of file