From eac227d1204f7ab149c98360994951cdd94771b0 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 12 Feb 2023 15:48:44 +0100 Subject: [PATCH] denc-webcluster: nginx config fixup - remove keys duplicated by include - repair wrong snippets include directory - repair wrong ip_hash option syntax Signed-off-by: Georg Pfuetzenreuter --- pillar/cluster/denc/web-proxy.sls | 7 ++----- 1 file 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