Skip to content

Commit 8b8a047

Browse files
tumbledwyertumbledwyer
authored
Merge pull request #110 from jembi/nginx_service_check_removal
Nginx service check removal
2 parents 5cd16d0 + bcbb7f6 commit 8b8a047

File tree

10 files changed

+112
-83
lines changed

10 files changed

+112
-83
lines changed

‎client-registry-santempi/config/http-client-registry-santempi-insecure.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ server {
22
listen 9200;
33

44
location / {
5-
proxy_pass http://santedb-www:9200;
5+
resolver 127.0.0.11 valid=30s;
6+
set $upstream_santedb_www santedb-www;
7+
proxy_pass http://$upstream_santedb_www:9200;
68
}
79
}
810
server {
911
listen 8084;
1012

1113
location / {
12-
proxy_pass http://santedb-mpi:8080;
14+
resolver 127.0.0.11 valid=30s;
15+
set $upstream_santedb_mpi santedb-mpi;
16+
proxy_pass http://$upstream_santedb_mpi:8080;
1317
}
1418
}

‎client-registry-santempi/config/http-client-registry-santempi-secure.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ server {
2424
}
2525

2626
location / {
27-
proxy_pass http://santedb-mpi:8080;
27+
resolver 127.0.0.11 valid=30s;
28+
set $upstream_santedb_mpi santedb-mpi;
29+
proxy_pass http://$upstream_santedb_mpi:8080;
2830
}
2931
}
3032

@@ -54,6 +56,8 @@ server {
5456
}
5557

5658
location / {
57-
proxy_pass http://santedb-www:9200;
59+
resolver 127.0.0.11 valid=30s;
60+
set $upstream_santedb_www santedb-www;
61+
proxy_pass http://$upstream_santedb_www:9200;
5862
}
5963
}

‎dashboard-visualiser-jsreport/config/http-jsreport-insecure.conf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
server {
2-
listen 5488;
2+
listen 5488;
33

44
location / {
5-
proxy_pass http://dashboard-visualiser-jsreport:5488;
5+
resolver 127.0.0.11 valid=30s;
6+
set $upstream_jsreport dashboard-visualiser-jsreport;
7+
proxy_pass http://$upstream_jsreport:5488;
68
}
79
}

‎dashboard-visualiser-jsreport/config/http-jsreport-secure.conf‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
server {
2-
listen 80;
3-
server_name reports.*;
2+
listen 80;
3+
server_name reports.*;
44

55
location /.well-known/acme-challenge/ {
6-
resolver 127.0.0.11 valid=30s;
7-
set $upstream_certbot certbot;
8-
proxy_pass http://$upstream_certbot$request_uri;
6+
resolver 127.0.0.11 valid=30s;
7+
set $upstream_certbot certbot;
8+
proxy_pass http://$upstream_certbot$request_uri;
99
}
1010

1111
location / {
12-
return 301 https://$host$request_uri;
12+
return 301 https://$host$request_uri;
1313
}
1414
}
1515
server {
16-
listen 443 ssl;
17-
listen [::]:443 ssl;
18-
server_name reports.*;
16+
listen 443 ssl;
17+
listen [::]:443 ssl;
18+
server_name reports.*;
1919

2020
location /.well-known/acme-challenge/ {
21-
resolver 127.0.0.11 valid=30s;
22-
set $upstream_certbot certbot;
23-
proxy_pass http://$upstream_certbot$request_uri;
21+
resolver 127.0.0.11 valid=30s;
22+
set $upstream_certbot certbot;
23+
proxy_pass http://$upstream_certbot$request_uri;
2424
}
2525

2626
location / {
27-
proxy_pass http://dashboard-visualiser-jsreport:5488;
27+
resolver 127.0.0.11 valid=30s;
28+
set $upstream_jsreport dashboard-visualiser-jsreport;
29+
proxy_pass http://$upstream_jsreport:5488;
2830
}
2931
}

‎dashboard-visualiser-kibana/config/http-kibana-insecure.conf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
server {
2-
listen 5601;
2+
listen 5601;
33

44
location / {
5-
proxy_pass http://dashboard-visualiser-kibana:5601;
5+
resolver 127.0.0.11 valid=30s;
6+
set $upstream_kibana dashboard-visualiser-kibana;
7+
proxy_pass http://$upstream_kibana:5601;
68
}
79
}

‎dashboard-visualiser-kibana/config/http-kibana-secure.conf‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
server {
2-
listen 80;
3-
server_name kibana.*;
2+
listen 80;
3+
server_name kibana.*;
44

55
location /.well-known/acme-challenge/ {
6-
resolver 127.0.0.11 valid=30s;
7-
set $upstream_certbot certbot;
8-
proxy_pass http://$upstream_certbot$request_uri;
6+
resolver 127.0.0.11 valid=30s;
7+
set $upstream_certbot certbot;
8+
proxy_pass http://$upstream_certbot$request_uri;
99
}
1010

1111
location / {
12-
return 301 https://$host$request_uri;
12+
return 301 https://$host$request_uri;
1313
}
1414
}
1515
server {
16-
listen 443 ssl;
17-
listen [::]:443 ssl;
18-
server_name kibana.*;
16+
listen 443 ssl;
17+
listen [::]:443 ssl;
18+
server_name kibana.*;
1919

2020
location /.well-known/acme-challenge/ {
21-
resolver 127.0.0.11 valid=30s;
22-
set $upstream_certbot certbot;
23-
proxy_pass http://$upstream_certbot$request_uri;
21+
resolver 127.0.0.11 valid=30s;
22+
set $upstream_certbot certbot;
23+
proxy_pass http://$upstream_certbot$request_uri;
2424
}
2525

2626
location / {
27-
proxy_pass http://dashboard-visualiser-kibana:5601;
27+
resolver 127.0.0.11 valid=30s;
28+
set $upstream_kibana dashboard-visualiser-kibana;
29+
proxy_pass http://$upstream_kibana:5601;
2830
}
2931
}

‎interoperability-layer-openhim/config/http-openhim-insecure.conf‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
# OpenHIM Core HTTP server config
22
server {
3-
listen 5001;
4-
client_max_body_size 10M;
3+
listen 5001;
4+
client_max_body_size 10M;
55

66
location / {
7-
proxy_pass http://openhim-core:5001;
7+
resolver 127.0.0.11 valid=30s;
8+
set $upstream_openhim_core openhim-core;
9+
proxy_pass http://$upstream_openhim_core:5001;
810
}
911
}
1012

1113
# OpenHIM Console
1214
server {
13-
listen 80;
15+
listen 80;
1416

1517
location / {
16-
proxy_pass http://openhim-console:80;
18+
resolver 127.0.0.11 valid=30s;
19+
set $upstream_openhim_console openhim-console;
20+
proxy_pass http://$upstream_openhim_console:80;
1721
}
1822
}

‎interoperability-layer-openhim/config/http-openhim-secure.conf‎

Lines changed: 46 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,99 @@
11
# OpenHIM Core API server config
22
server {
3-
listen 80;
4-
server_name openhimcomms.*;
3+
listen 80;
4+
server_name openhimcomms.*;
55

66
location /.well-known/acme-challenge/ {
7-
resolver 127.0.0.11 valid=30s;
8-
set $upstream_certbot certbot;
9-
proxy_pass http://$upstream_certbot$request_uri;
7+
resolver 127.0.0.11 valid=30s;
8+
set $upstream_certbot certbot;
9+
proxy_pass http://$upstream_certbot$request_uri;
1010
}
1111

1212
location / {
13-
return 301 https://$host$request_uri;
13+
return 301 https://$host$request_uri;
1414
}
1515
}
1616
server {
17-
listen 443 ssl;
18-
listen [::]:443 ssl;
19-
server_name openhimcomms.*;
17+
listen 443 ssl;
18+
listen [::]:443 ssl;
19+
server_name openhimcomms.*;
2020

2121
location /.well-known/acme-challenge/ {
22-
resolver 127.0.0.11 valid=30s;
23-
set $upstream_certbot certbot;
24-
proxy_pass http://$upstream_certbot$request_uri;
22+
resolver 127.0.0.11 valid=30s;
23+
set $upstream_certbot certbot;
24+
proxy_pass http://$upstream_certbot$request_uri;
2525
}
2626

2727
location / {
28-
proxy_pass https://openhim-core:8080;
28+
resolver 127.0.0.11 valid=30s;
29+
set $upstream_openhim_core openhim-core;
30+
proxy_pass https://$upstream_openhim_core:8080;
2931
}
3032
}
3133

3234
# OpenHIM Core HTTP server config
3335
server {
34-
listen 80;
35-
server_name openhimcore.*;
36+
listen 80;
37+
server_name openhimcore.*;
3638

3739
location /.well-known/acme-challenge/ {
38-
resolver 127.0.0.11 valid=30s;
39-
set $upstream_certbot certbot;
40-
proxy_pass http://$upstream_certbot$request_uri;
40+
resolver 127.0.0.11 valid=30s;
41+
set $upstream_certbot certbot;
42+
proxy_pass http://$upstream_certbot$request_uri;
4143
}
4244

4345
location / {
44-
return 301 https://$host$request_uri;
46+
return 301 https://$host$request_uri;
4547
}
4648
}
4749
server {
48-
listen 443 ssl;
49-
listen [::]:443 ssl;
50-
server_name openhimcore.*;
51-
client_max_body_size 10M;
50+
listen 443 ssl;
51+
listen [::]:443 ssl;
52+
server_name openhimcore.*;
53+
client_max_body_size 10M;
5254

5355
location /.well-known/acme-challenge/ {
54-
resolver 127.0.0.11 valid=30s;
55-
set $upstream_certbot certbot;
56-
proxy_pass http://$upstream_certbot$request_uri;
56+
resolver 127.0.0.11 valid=30s;
57+
set $upstream_certbot certbot;
58+
proxy_pass http://$upstream_certbot$request_uri;
5759
}
5860

5961
location / {
60-
proxy_pass https://openhim-core:5000;
62+
resolver 127.0.0.11 valid=30s;
63+
set $upstream_openhim_core openhim-core;
64+
proxy_pass https://$upstream_openhim_core:5000;
6165
}
6266
}
6367

6468
# OpenHIM Console
6569
server {
66-
listen 80;
67-
server_name openhimconsole.*;
70+
listen 80;
71+
server_name openhimconsole.*;
6872

6973
location /.well-known/acme-challenge/ {
70-
resolver 127.0.0.11 valid=30s;
71-
set $upstream_certbot certbot;
72-
proxy_pass http://$upstream_certbot$request_uri;
74+
resolver 127.0.0.11 valid=30s;
75+
set $upstream_certbot certbot;
76+
proxy_pass http://$upstream_certbot$request_uri;
7377
}
7478

7579
location / {
76-
return 301 https://$host$request_uri;
80+
return 301 https://$host$request_uri;
7781
}
7882
}
7983
server {
80-
listen 443 ssl;
81-
listen [::]:443 ssl;
82-
server_name openhimconsole.*;
84+
listen 443 ssl;
85+
listen [::]:443 ssl;
86+
server_name openhimconsole.*;
8387

8488
location /.well-known/acme-challenge/ {
85-
resolver 127.0.0.11 valid=30s;
86-
set $upstream_certbot certbot;
87-
proxy_pass http://$upstream_certbot$request_uri;
89+
resolver 127.0.0.11 valid=30s;
90+
set $upstream_certbot certbot;
91+
proxy_pass http://$upstream_certbot$request_uri;
8892
}
8993

9094
location / {
91-
proxy_pass http://openhim-console:80;
95+
resolver 127.0.0.11 valid=30s;
96+
set $upstream_openhim_console openhim-console;
97+
proxy_pass http://$upstream_openhim_console:80;
9298
}
9399
}

‎interoperability-layer-openhim/config/stream-openhim-insecure.conf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# use a stream so don't terminate ssl here
22
server {
3-
listen 8080;
4-
proxy_pass openhim-core:8080;
3+
listen 8080;
4+
resolver 127.0.0.11 valid=30s;
5+
set $upstream_openhim_core openhim-core;
6+
proxy_pass $upstream_openhim_core:8080;
57
}

‎reverse-proxy-nginx/swarm.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ main() {
119119

120120
log info "Done updating nginx service"
121121

122+
local staging_args=""
122123
if [ "${STAGING}" == "true" ]; then
123-
local staging_args="--staging"
124+
staging_args="--staging"
124125
fi
125126

126127
#Generate real certificate
@@ -140,7 +141,7 @@ main() {
140141
try "docker run --rm --network host --name certbot-helper -w /temp \
141142
-v data-certbot-conf:/temp-certificates \
142143
-v instant:/temp busybox sh \
143-
-c rm -rf certificates; mkdir certificates; cp -r /temp-certificates/* /temp/certificates" "Failed to transfer certificate"
144+
-c \"rm -rf certificates; mkdir -p certificates; cp -r /temp-certificates/* /temp/certificates\"" "Failed to transfer certificate"
144145
try "docker volume rm data-certbot-conf" "Failed to remove data-certbot-conf volume"
145146

146147
local new_timestamp

0 commit comments

Comments
 (0)