summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-02-12 15:56:30 +0100
committerGeorg Pfuetzenreuter2023-02-12 15:56:30 +0100
commit91089d5d98d1a8833698d719beb7211988a52cb2 (patch)
treedf2933fb66d80449a70dbbad67824645dce3ae8f
parentf9341ad9fe4ba5bdd255f050424e492ec7ccce5b (diff)
parenteac227d1204f7ab149c98360994951cdd94771b0 (diff)
downloadsalt-91089d5d98d1a8833698d719beb7211988a52cb2.tar.gz
salt-91089d5d98d1a8833698d719beb7211988a52cb2.tar.bz2
salt-91089d5d98d1a8833698d719beb7211988a52cb2.zip
Merge pull request 'denc-webcluster: nginx config fixup' (#26) from import-denc-webcluster-iphash into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/26
-rw-r--r--pillar/cluster/denc/web-proxy.sls7
1 files changed, 2 insertions, 5 deletions
diff --git a/pillar/cluster/denc/web-proxy.sls b/pillar/cluster/denc/web-proxy.sls
index 2e8859d..7b5cebd 100644
--- a/pillar/cluster/denc/web-proxy.sls
+++ b/pillar/cluster/denc/web-proxy.sls
@@ -90,18 +90,15 @@ nginx:
{{ nginx_crtkeypair('lysergic', 'lysergic.dev') | indent }}
- include: snippets/tls
tls_syscidsso:
- - ssl_trusted_certificate: {{ trustcrt }}
- ssl_client_certificate: {{ trustcrt }}
- ssl_certificate: /etc/ssl/syscid/sso.syscid.com.crt
- ssl_certificate_key: /etc/ssl/syscid/sso.syscid.com.key
- ssl_ocsp: 'on'
- ssl_ocsp_responder: {{ stapler }}
- - ssl_stapling: 'on'
- ssl_stapling_responder: {{ stapler }}
- - ssl_stapling_verify: 'on'
- ssl_verify_client: 'on'
- resolver: {{ resolver }} ipv6=off
- - include: snippets.d/tls
+ - include: snippets/tls
servers:
managed:
@@ -111,7 +108,7 @@ nginx:
- proxy_cache_path: /var/cache/nginx/sso_public keys_zone=cache_sso_public:10m
- proxy_cache_path: /var/cache/nginx/sso_private keys_zone=cache_sso_private:10m
- upstream jboss:
- - ip: hash
+ - ip_hash: ''
- server:
- theia.backend.syscid.com:8443
- orpheus.backend.syscid.com:8443