From 60de35b9456c4a23fb42be00a6fd8ec329285845 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Fri, 15 May 2020 17:13:44 -0400
Subject: [PATCH] 0.1.28-DEV-20200515-171249 --------------------------     *
 ADD:       - status_page option for /nginx_status; toggle per site

    * MODIFY:
      - defaults/main/proxy_sites.yml formatting modified for readability
---
 defaults/main/proxy_site_defs.yml |  2 +-
 defaults/main/proxy_sites.yml     | 73 ++++++++++++++++---------------
 templates/proxy_site.j2           |  6 +++
 3 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/defaults/main/proxy_site_defs.yml b/defaults/main/proxy_site_defs.yml
index 84450aa..e2de7e3 100644
--- a/defaults/main/proxy_site_defs.yml
+++ b/defaults/main/proxy_site_defs.yml
@@ -3,7 +3,7 @@
   proxy_site_conf_dir : /etc/nginx/conf.d
   proxy_site_file     : "{{ proxy_site_conf_dir }}/zen_proxy.conf"
   proxy_site_version  : 1.8
-  proxy_site_revision : 20200113-141420
+  proxy_site_revision : 20200515-171007
 
 
   proxy_site_log_path   : /proxy_logs
diff --git a/defaults/main/proxy_sites.yml b/defaults/main/proxy_sites.yml
index 4c44a9b..33dc03e 100644
--- a/defaults/main/proxy_sites.yml
+++ b/defaults/main/proxy_sites.yml
@@ -2,9 +2,9 @@
 
 proxy_sites:
   wiki.thezengarden.net:
-    proto : http
-    dest  : docker.thezengarden.net
-    port  : 8081
+    proto      : http
+    dest       : docker.thezengarden.net
+    port       : 8081
     max_upload : "{{ proxy_default_max_upload }}"
 
 
@@ -23,9 +23,9 @@ proxy_sites:
 
 
   hastebin.thezengarden.net:
-    proto : http
-    dest  : docker.thezengarden.net
-    port  : 7777
+    proto      : http
+    dest       : docker.thezengarden.net
+    port       : 7777
     max_upload : "{{ proxy_default_max_upload }}"
 
 
@@ -90,9 +90,9 @@ proxy_sites:
 
 
   wordpress.thezengarden.net:
-    proto : http
-    dest  : zg-lxwb03.thezengarden.net
-    port  : 80
+    proto      : http
+    dest       : zg-lxwb03.thezengarden.net
+    port       : 80
     max_upload : "{{ proxy_default_max_upload }}"
 
 
@@ -123,9 +123,9 @@ proxy_sites:
 
 
   dashboard.thezengarden.net:
-    proto : http
-    dest  : "{{ proxy_default_host }}"
-    port  : 80
+    proto      : http
+    dest       : "{{ proxy_default_host }}"
+    port       : 80
     max_upload : "{{ proxy_default_max_upload }}"
 
 
@@ -174,18 +174,19 @@ proxy_sites:
 
 
   resources.thezengarden.net:
-    proto : http
-    dest  : "{{ proxy_default_host }}"
-    port  : 80
+    proto      : http
+    dest       : "{{ proxy_default_host }}"
+    port       : 80
     max_upload : "{{ proxy_default_max_upload }}"
 
 
   thezengarden.net:
-    aliases    : www.thezengarden.net
-    proto      : https
-    dest       : "{{ proxy_default_host }}"
-    port       : 443
-    max_upload : "{{ proxy_default_max_upload }}"
+    aliases     : www.thezengarden.net
+    proto       : https
+    dest        : "{{ proxy_default_host }}"
+    port        : 443
+    max_upload  : "{{ proxy_default_max_upload }}"
+    status_page : True
 
 
   devel.thezengarden.net:
@@ -195,30 +196,30 @@ proxy_sites:
 
 
   beta.chris-hammer.com:
-    proto    : http
-    dest     : "{{ proxy_default_host }}"
-    port     : 80
-    ssl_cert : "{{ proxy_site_ssl_directory }}/chris-hammer.com/fullchain7.pem"
-    ssl_key  : "{{ proxy_site_ssl_directory }}/chris-hammer.com/privkey7.pem"
+    proto      : http
+    dest       : "{{ proxy_default_host }}"
+    port       : 80
+    ssl_cert   : "{{ proxy_site_ssl_directory }}/chris-hammer.com/fullchain7.pem"
+    ssl_key    : "{{ proxy_site_ssl_directory }}/chris-hammer.com/privkey7.pem"
     max_upload : "{{ proxy_default_max_upload }}"
 
 
   christian-hammer.com:
-    aliases  : www.christian-hammer.com
-    proto    : http
-    dest     : "{{ proxy_default_host }}"
-    port     : 80
-    ssl_cert : "{{ proxy_site_ssl_directory }}/christian-hammer.com/fullchain7.pem"
-    ssl_key  : "{{ proxy_site_ssl_directory }}/christian-hammer.com/privkey7.pem"
+    aliases    : www.christian-hammer.com
+    proto      : http
+    dest       : "{{ proxy_default_host }}"
+    port       : 80
+    ssl_cert   : "{{ proxy_site_ssl_directory }}/christian-hammer.com/fullchain7.pem"
+    ssl_key    : "{{ proxy_site_ssl_directory }}/christian-hammer.com/privkey7.pem"
     max_upload : "{{ proxy_default_max_upload }}"
 
 
   chris-hammer.com:
-    proto    : http
-    dest     : "{{ proxy_default_host }}"
-    port     : 80
-    ssl_cert : "{{ proxy_site_ssl_directory }}/chris-hammer.com/fullchain7.pem"
-    ssl_key  : "{{ proxy_site_ssl_directory }}/chris-hammer.com/privkey7.pem"
+    proto      : http
+    dest       : "{{ proxy_default_host }}"
+    port       : 80
+    ssl_cert   : "{{ proxy_site_ssl_directory }}/chris-hammer.com/fullchain7.pem"
+    ssl_key    : "{{ proxy_site_ssl_directory }}/chris-hammer.com/privkey7.pem"
     max_upload : "{{ proxy_default_max_upload }}"
 
 
diff --git a/templates/proxy_site.j2 b/templates/proxy_site.j2
index bc89746..9a4a391 100644
--- a/templates/proxy_site.j2
+++ b/templates/proxy_site.j2
@@ -27,6 +27,12 @@ server {
 client_max_body_size {{ proxy_sites[item.key]['max_upload'] }};
   {% endif %}
 
+  {% if proxy_sites[item.key]['status_page'] is defined %}
+  location /nginx_status {
+    stub_status;
+  }
+  {% endif %}
+
   location / {
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-Host $host;