Skip to content

Commit

Permalink
first attempt at fixing the strict ssl thing on all hosts
Browse files Browse the repository at this point in the history
  • Loading branch information
timcowlishaw committed Apr 3, 2024
1 parent ad27c71 commit abe52fa
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
3 changes: 1 addition & 2 deletions compose/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ services:
depends_on:
- app
ports:
- 80:80
- 80:80/udp
- 443:443
- 443:443/udp
volumes:
- ../scripts/nginx-conf/api.smartcitizen.me.conf:/etc/nginx/conf.d/api.smartcitizen.me.conf
- ../scripts/nginx.conf:/etc/nginx/nginx.conf
Expand Down
22 changes: 15 additions & 7 deletions scripts/nginx-conf/api.smartcitizen.me.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ upstream docker-push {
}

server {
listen 80;

listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /etc/ssl/star_smartcitizen_me.pem;
ssl_certificate_key /etc/ssl/star_smartcitizen_me.key;

server_name staging-ws.smartcitizen.me ws.smartcitizen.me;

location / {
Expand All @@ -17,7 +22,11 @@ server {

server {
server_name kairos.smartcitizen.me staging-kairos.smartcitizen.me;
listen 80;

listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /etc/ssl/star_smartcitizen_me.pem;
ssl_certificate_key /etc/ssl/star_smartcitizen_me.key;

location / {
proxy_pass http://kairos:8080;
Expand All @@ -30,8 +39,10 @@ server {
server {
server_name id.smartcitizen.me id2.smartcitizen.me staging-id.smartcitizen.me;

listen 80;
listen [::]:80;
listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /etc/ssl/star_smartcitizen_me.pem;
ssl_certificate_key /etc/ssl/star_smartcitizen_me.key;

try_files $uri/index.html $uri @app;

Expand Down Expand Up @@ -74,9 +85,6 @@ server {
server {
server_name api.smartcitizen.me data.smartcitizen.me staging-api.smartcitizen.me staging-data.smartcitizen.me new-api.smartcitizen.me;

listen 80;
listen [::]:80;

listen 443 ssl;
listen [::]:443 ssl;
ssl_certificate /etc/ssl/star_smartcitizen_me.pem;
Expand Down

0 comments on commit abe52fa

Please sign in to comment.