Skip to content

Commit 35a3d12

Browse files
authored
Merge pull request #23 from oneingan/fix-tls-disabled
fix tls disabled typo and healthcheck
2 parents 2f083ec + 8ced03a commit 35a3d12

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ services:
6464
- TLS_KEY_FILE=/run/secrets/tls_key
6565
- TLS_CERT_FILE=/run/secrets/tls_cert
6666
- TLS_CA_FILE=/run/secrets/tls_ca
67-
- TLS_DISABLE=false
67+
- TLS_DISABLED=false
6868
user: root
6969
secrets:
7070
- tls_key
@@ -128,7 +128,7 @@ docker service create --name tenant1_nginx nginx
128128
- TLS_KEY_FILE: Path to TLS key file.
129129
- TLS_CERT_FILE: Path to TLS cert file.
130130
- TLS_CERT_FILE: Path to TLS cert file.
131-
- TLS_DISABLE: Set to 1 or true to disable TLS.
131+
- TLS_DISABLED: Set to 1 or true to disable TLS.
132132

133133

134134
## 🤝 How to achieve Multitenancy with this?

deploy/tenant1/stack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
- TLS_KEY_FILE=/run/secrets/tls_key
1414
- TLS_CERT_FILE=/run/secrets/tls_cert
1515
- TLS_CA_FILE=/run/secrets/tls_ca
16-
- TLS_DISABLE=false
16+
- TLS_DISABLED=false
1717
user: root
1818
secrets:
1919
- tls_key

deploy/tenant2/stack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
- TLS_KEY_FILE=/run/secrets/tls_key
1414
- TLS_CERT_FILE=/run/secrets/tls_cert
1515
- TLS_CA_FILE=/run/secrets/tls_ca
16-
- TLS_DISABLE=false
16+
- TLS_DISABLED=false
1717
user: root
1818
secrets:
1919
- tls_key

swarmgate/healthcheck.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if (!TLS_DISABLED) {
3838
timeout: 2000,
3939
host: 'localhost',
4040
port: process.env.PORT || 8080,
41-
path: '/_healthz'
41+
path: '/_ping'
4242
}, (res) => {
4343
console.info('STATUS: ' + res.statusCode);
4444
process.exitCode = (res.statusCode === 200) ? 0 : 1;

0 commit comments

Comments
 (0)