From ed9ad3872dd69044e9c2935c3b07f464120341eb Mon Sep 17 00:00:00 2001
From: Scott Koranda <skoranda@gmail.com>
Date: Thu, 14 Nov 2019 05:01:19 -0600
Subject: [PATCH] Switch to use the TIER image for COmanage Registry

Switch to using the TIERR image for COmanage Registry instead of the
Spherical Cow Group image.
---
 .../training/files/comanage-registry-stack.yml |  5 ++---
 roles/training/tasks/main.yml                  |  1 +
 roles/training/templates/000-comanage.conf     | 18 +++++++++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/roles/training/files/comanage-registry-stack.yml b/roles/training/files/comanage-registry-stack.yml
index cefe56c..61d3ee3 100644
--- a/roles/training/files/comanage-registry-stack.yml
+++ b/roles/training/files/comanage-registry-stack.yml
@@ -21,14 +21,13 @@ services:
                 tag: "mariadb-{{.Name}}"
 
     registry:
-        # Change this to TAP image when it is ready.
-        image: sphericalcowgroup/comanage-registry:hotfix-3.2.x-shibboleth-sp-4
+        image: tier/comanage:3.2.2-20191108
         volumes:
             - /srv/docker/srv/comanage-registry/local:/srv/comanage-registry/local
             - /srv/docker/etc/shibboleth/shibboleth2.xml:/etc/shibboleth/shibboleth2.xml
             - /srv/docker/etc/shibboleth/attribute-map.xml:/etc/shibboleth/attribute-map.xml
             - /srv/docker/etc/shibboleth/idp-metadata.xml:/etc/shibboleth/idp-metadata.xml
-            - /srv/docker/etc/apache2/sites-available/000-comanage.conf:/etc/apache2/sites-available/000-comanage.conf
+            - /srv/docker/etc/httpd/conf.d/000-comanage.conf:/etc/httpd/conf.d/000-comanage.conf
         environment:
             - COMANAGE_REGISTRY_ADMIN_GIVEN_NAME=
             - COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=
diff --git a/roles/training/tasks/main.yml b/roles/training/tasks/main.yml
index e2d9d63..89ea9df 100644
--- a/roles/training/tasks/main.yml
+++ b/roles/training/tasks/main.yml
@@ -34,6 +34,7 @@
       - /srv/docker/etc/ldap/slapd.d
       - /srv/docker/etc/shibboleth
       - /srv/docker/etc/apache2/sites-available
+      - /srv/docker/etc/httpd/conf.d
       - /srv/docker/ldif
 
   - name: Copy service stack file
diff --git a/roles/training/templates/000-comanage.conf b/roles/training/templates/000-comanage.conf
index bed9d73..ab00a53 100644
--- a/roles/training/templates/000-comanage.conf
+++ b/roles/training/templates/000-comanage.conf
@@ -26,10 +26,22 @@ DocumentRoot /var/www/html
 
 RedirectMatch ^/$ /registry/
 
-ErrorLog ${APACHE_LOG_DIR}/error.log
-CustomLog ${APACHE_LOG_DIR}/access.log combined
+PassEnv ENV
+PassEnv USERTOKEN
 
-Include apache-include-directory-registry
+ErrorLogFormat "httpd;ssl_error_log;%{ENV}e;%{USERTOKEN}e;[%{u}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i"
+ErrorLog /tmp/logpipe
+LogLevel warn
+
+LogFormat "httpd;ssl_access_log;%{ENV}e;%{USERTOKEN}e;%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" ssl_combined
+CustomLog /tmp/logpipe ssl_combined
+
+<Directory /var/www/html/registry>
+Options Indexes FollowSymLinks
+DirectoryIndex index.php
+AllowOverride All
+Require all granted
+</Directory>
 
 <Location "/Shibboleth.sso">
 SetHandler shib