From 6ca00655fb44593816bf46e5f888b033f69c71fd Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Sun, 24 Jan 2021 09:44:43 -0500
Subject: [PATCH] 0.1.40-DEV-20210124-094325 --------------------------     *
 MODIFY:       - gitlab ci job tags updated to run on the ci host instead of
 workstation       - ssl references updated as certs have been renewed

    * ADD:
      - hme-3.thezengarden.net added for external lab tower instance access
---
 .gitlab-ci.yml                    |  4 ++--
 defaults/main/proxy_site_defs.yml |  4 ++--
 defaults/main/proxy_sites.yml     | 34 +++++++++++++------------------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2525563..9cb4082 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,14 +27,14 @@ stages:
 ### BEGIN TEMPLATES ###
 .deb_header_template: &deb_header
   tags:
-    - zen-ci-deb-workstation
+    - zen-ci-deb
   only:
     - development
 
 
 .centos_header_template: &centos_header
   tags:
-    - zen-ci-workstation
+    - zen-ci
   only:
     - development
 
diff --git a/defaults/main/proxy_site_defs.yml b/defaults/main/proxy_site_defs.yml
index 281a9f9..28a6511 100644
--- a/defaults/main/proxy_site_defs.yml
+++ b/defaults/main/proxy_site_defs.yml
@@ -34,8 +34,8 @@
 
 
   proxy_site_ssl_directory       : /etc/nginx/ssl
-  proxy_site_ssl_certificate     : "{{ proxy_site_ssl_directory }}/thezengarden.net/fullchain10.pem"
-  proxy_site_ssl_certificate_key : "{{ proxy_site_ssl_directory }}/thezengarden.net/privkey10.pem"
+  proxy_site_ssl_certificate     : "{{ proxy_site_ssl_directory }}/thezengarden.net/fullchain11.pem"
+  proxy_site_ssl_certificate_key : "{{ proxy_site_ssl_directory }}/thezengarden.net/privkey11.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 5cec1c5..1467d18 100644
--- a/defaults/main/proxy_sites.yml
+++ b/defaults/main/proxy_sites.yml
@@ -72,18 +72,18 @@ proxy_sites:
     port  : 9090
 
 
+  hme-3.thezengarden.net:
+    proto : https
+    dest  : 10.10.10.66
+    port  : 443
+
+
   gw.thezengarden.net:
     proto : https
     dest  : er4.thezengarden.net
     port  : 443
 
 
-#  hme-3.thezengarden.net:
-#    proto : https
-#    dest  : kaiju.thezengarden.net
-#    port  : 8006
-
-
   chat.thezengarden.net:
     proto : http
     dest  : docker.thezengarden.net
@@ -129,12 +129,6 @@ proxy_sites:
     port  : 80
 
 
-  tower-stage.thezengarden.net:
-    proto : http
-    dest  : awx-stage.thezengarden.net
-    port  : 80
-
-
   dashboard.thezengarden.net:
     proto      : http
     dest       : "{{ proxy_default_host }}"
@@ -181,8 +175,8 @@ proxy_sites:
     proto      : http
     dest       : "{{ proxy_default_host }}"
     port       : 80
-    ssl_cert   : "{{ proxy_site_ssl_directory }}/lakeshorebulldogs.com/fullchain4.pem"
-    ssl_key    : "{{ proxy_site_ssl_directory }}/lakeshorebulldogs.com/privkey4.pem"
+    ssl_cert   : "{{ proxy_site_ssl_directory }}/lakeshorebulldogs.com/fullchain5.pem"
+    ssl_key    : "{{ proxy_site_ssl_directory }}/lakeshorebulldogs.com/privkey5.pem"
     max_upload : "{{ proxy_default_max_upload }}"
 
 
@@ -212,8 +206,8 @@ proxy_sites:
     proto      : http
     dest       : "{{ proxy_default_host }}"
     port       : 80
-    ssl_cert   : "{{ proxy_site_ssl_directory }}/chris-hammer.com/fullchain9.pem"
-    ssl_key    : "{{ proxy_site_ssl_directory }}/chris-hammer.com/privkey9.pem"
+    ssl_cert   : "{{ proxy_site_ssl_directory }}/chris-hammer.com/fullchain10.pem"
+    ssl_key    : "{{ proxy_site_ssl_directory }}/chris-hammer.com/privkey10.pem"
     max_upload : "{{ proxy_default_max_upload }}"
 
 
@@ -222,8 +216,8 @@ proxy_sites:
     proto      : http
     dest       : "{{ proxy_default_host }}"
     port       : 80
-    ssl_cert   : "{{ proxy_site_ssl_directory }}/christian-hammer.com/fullchain9.pem"
-    ssl_key    : "{{ proxy_site_ssl_directory }}/christian-hammer.com/privkey9.pem"
+    ssl_cert   : "{{ proxy_site_ssl_directory }}/christian-hammer.com/fullchain10.pem"
+    ssl_key    : "{{ proxy_site_ssl_directory }}/christian-hammer.com/privkey10.pem"
     max_upload : "{{ proxy_default_max_upload }}"
 
 
@@ -231,8 +225,8 @@ proxy_sites:
     proto      : http
     dest       : "{{ proxy_default_host }}"
     port       : 80
-    ssl_cert   : "{{ proxy_site_ssl_directory }}/chris-hammer.com/fullchain9.pem"
-    ssl_key    : "{{ proxy_site_ssl_directory }}/chris-hammer.com/privkey9.pem"
+    ssl_cert   : "{{ proxy_site_ssl_directory }}/chris-hammer.com/fullchain10.pem"
+    ssl_key    : "{{ proxy_site_ssl_directory }}/chris-hammer.com/privkey10.pem"
     max_upload : "{{ proxy_default_max_upload }}"