Merge pull request #44 from internet2/PCupdates

more fixes
internet2 · Dec 10, 2020 · 41338fd · 41338fd
2 parents 00a16ef + 0cd8125
commit 41338fd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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/