diff --git a/defaults/main/proxy_site_defs.yml b/defaults/main/proxy_site_defs.yml index 8701000..ba995d2 100644 --- a/defaults/main/proxy_site_defs.yml +++ b/defaults/main/proxy_site_defs.yml @@ -34,12 +34,12 @@ proxy_site_ssl_directory : /etc/nginx/ssl - proxy_site_ssl_certificate : "{{ proxy_site_ssl_directory }}/thezengarden.net/fullchain19.pem" - proxy_site_ssl_certificate_key : "{{ proxy_site_ssl_directory }}/thezengarden.net/privkey19.pem" - proxy_site_ssl_certificate_ch : "{{ proxy_site_ssl_directory }}/chris-hammer.com/fullchain8.pem" - proxy_site_ssl_certificate_key_ch : "{{ proxy_site_ssl_directory }}/chris-hammer.com/privkey8.pem" - proxy_site_ssl_certificate_cht : "{{ proxy_site_ssl_directory }}/christian-hammer.com/fullchain17.pem" - proxy_site_ssl_certificate_key_cht : "{{ proxy_site_ssl_directory }}/christian-hammer.com/privkey17.pem" + proxy_site_ssl_certificate : "{{ proxy_site_ssl_directory }}/thezengarden.net/fullchain20.pem" + proxy_site_ssl_certificate_key : "{{ proxy_site_ssl_directory }}/thezengarden.net/privkey20.pem" + proxy_site_ssl_certificate_ch : "{{ proxy_site_ssl_directory }}/chris-hammer.com/fullchain9.pem" + proxy_site_ssl_certificate_key_ch : "{{ proxy_site_ssl_directory }}/chris-hammer.com/privkey9.pem" + proxy_site_ssl_certificate_cht : "{{ proxy_site_ssl_directory }}/christian-hammer.com/fullchain18.pem" + proxy_site_ssl_certificate_key_cht : "{{ proxy_site_ssl_directory }}/christian-hammer.com/privkey18.pem" proxy_site_ssl_protocols : TLSv1.2 proxy_site_ssl_ciphers : ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256 diff --git a/defaults/main/proxy_sites.yml b/defaults/main/proxy_sites.yml index 60a8d1d..eaf8ba5 100644 --- a/defaults/main/proxy_sites.yml +++ b/defaults/main/proxy_sites.yml @@ -96,13 +96,6 @@ proxy_sites: port : 80 - wordpress.thezengarden.net: - proto : http - dest : zg-lxwb03.thezengarden.net - port : 80 - max_upload : "{{ proxy_default_max_upload }}" - - mail.thezengarden.net: proto : https dest : mailcow.thezengarden.net @@ -149,13 +142,6 @@ proxy_sites: max_upload : "{{ proxy_default_max_upload }}" - cloud.thezengarden.net: - proto : https - dest : zg-lxoc01.thezengarden.net - port : 443 - max_upload : "{{ proxy_default_max_upload }}" - - wifi.thezengarden.net: proto : https dest : unifi.thezengarden.net @@ -192,24 +178,12 @@ proxy_sites: port : 80 - conjur.thezengarden.net: - proto : https - dest : 10.1.1.34 - port : 443 - - hub.thezengarden.net: proto : https dest : 10.1.1.126 port : 443 - keycloak.thezengarden.net: - proto : http - dest : podman.thezengarden.net - port : 8080 - - sso.thezengarden.net: proto : https dest : docker.thezengarden.net