diff --git a/docker-compose.local.yml b/docker-compose.local.yml index e6f47b6043fa2090ab829f8fb6d15701b0666c2a..c93ac0c174fa766eedc21381257910bb89a17f0e 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -16,7 +16,6 @@ services: - ./cert.pem:/etc/nginx/cert.pem - ./key.pem:/etc/nginx/key.pem ports: - - 8080:8080 - 443:443 database: diff --git a/nginx/site.conf b/nginx/site.conf index 995197a23c91516d28c9e9b822046447df28acec..5849a845c06c75581d97e1927485b2f522e5f828 100644 --- a/nginx/site.conf +++ b/nginx/site.conf @@ -1,8 +1,12 @@ server { - listen 8080; + listen 443 ssl; server_name local; + ssl_certificate /etc/nginx/cert.pem; + ssl_certificate_key /etc/nginx/key.pem; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers HIGH:!aNULL:!MD5; - location / { + location / { root /usr/share/nginx/html; index index.html index.htm; try_files $uri $uri/ /index.html =404; @@ -19,23 +23,4 @@ server { location /Logout { proxy_pass https://backend:1443/Logout; } - -} - -server { - listen 443 ssl; - server_name local; - ssl_certificate /etc/nginx/cert.pem; - ssl_certificate_key /etc/nginx/key.pem; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers HIGH:!aNULL:!MD5; - - location / { - proxy_pass http://localhost:8080; - } - location /OAuth2Callback { - proxy_pass https://backend:1443/OAuth2Callback; - } - - } \ No newline at end of file