From 0cd8125cf8136b113a39d0395732e0be761e61df Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 10 Dec 2020 12:05:40 -0600
Subject: [PATCH] more fixes

---
 Workbench/grouper_data/Dockerfile                   | 2 +-
 Workbench/webproxy/container_files/httpd/index.html | 6 ++++++
 Workbench/webproxy/container_files/httpd/proxy.conf | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Workbench/grouper_data/Dockerfile b/Workbench/grouper_data/Dockerfile
index f12245e..7ccbf7c 100644
--- a/Workbench/grouper_data/Dockerfile
+++ b/Workbench/grouper_data/Dockerfile
@@ -1,4 +1,4 @@
-FROM tier/grouper:2.4.0-a47-u25-w5-p6-20190611
+FROM i2incommon/grouper:2.5.37.1
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
 
diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
index 2605224..2557058 100644
--- a/Workbench/webproxy/container_files/httpd/index.html
+++ b/Workbench/webproxy/container_files/httpd/index.html
@@ -14,6 +14,12 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 <li><a href="https://__CSPHOSTNAME__/midpoint" target="TAP-WB-MIDPOINT">midPoint (4.1)</a></li>
 <li><a href="https://__CSPHOSTNAME__/registry" target="TAP-WB-COMANAGE">COmanage (3.3.1)</a></li>
 </ul>
+<br />
+The system also contains the following downstream/target applications:
+<ul>
+<li><a href="https://__CSPHOSTNAME__/wordpress/wp/admin" target="TAP-WB-WORDPRESS">WordPress</a></li>
+</ul>
+<br />
  In addition, the following applications are available:
 <ul>
 <li><a href="https://__CSPHOSTNAME__/rabbit" target="TAP-WB-RABBIT">Rabbit MQ</a></li>
diff --git a/Workbench/webproxy/container_files/httpd/proxy.conf b/Workbench/webproxy/container_files/httpd/proxy.conf
index b03533c..32e72be 100644
--- a/Workbench/webproxy/container_files/httpd/proxy.conf
+++ b/Workbench/webproxy/container_files/httpd/proxy.conf
@@ -45,3 +45,6 @@ ProxyPassReverse /phpmyadmin https://directory/phpmyadmin
 ProxyPass /registry https://comanage/registry
 ProxyPass /registrySSO https://comanage/registrySSO
 #ProxyPassReverse /comanage https://comanage/
+
+ProxyPass /wordpress http://wordpress_server/
+ProxyPassReverse /wordpress http://wordpress_server/
\ No newline at end of file