From 7b321cb1aba622b0ab7dde142eefa93f21a8ff86 Mon Sep 17 00:00:00 2001
From: Scott Koranda <skoranda@gmail.com>
Date: Tue, 2 May 2017 06:21:56 -0500
Subject: [PATCH] better stack for mod-auth-openidc and mariadb

---
 comanage-registry-stack/README.md              | 18 +++++++-----------
 ...egistry-mod-auth-openidc-mariadb-stack.yml} |  8 ++++----
 2 files changed, 11 insertions(+), 15 deletions(-)
 rename comanage-registry-stack/{comanage-registry-mod-auth-openidc-maridb-stack.yml => comanage-registry-mod-auth-openidc-mariadb-stack.yml} (93%)

diff --git a/comanage-registry-stack/README.md b/comanage-registry-stack/README.md
index 893ac88..90e93bc 100644
--- a/comanage-registry-stack/README.md
+++ b/comanage-registry-stack/README.md
@@ -19,29 +19,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-# Docker Compose Example for COmanage Registry 
+# Docker Stack Deploy for COmanage Registry 
 
-This is an example Docker Compose file to deploy COmanage
-Registry with the Shibboleth Native SP for Apache HTTP Server
-and a PostgreSQL database.
+This is an example Docker compose file to deploy COmanage
+Registry with mod_auth_openidc for Apache HTTP Server
+for authentication and a MariaDB database using Docker stack deploy.
 
 See the individual image Dockerfile templates and README
 files for details on how to prepare the volumes and the
 necessary contents including the COmanage Registry 
-configuration and the Shibboleth SP configuration.
-
-Change the tag from `COMANAGE_REGISTRY_VERSION-shibboleth-sp`
-to `COMANAGE_REGISTRY_VERSION-basic-auth` to quickly deploy
-without the need for federation.
+configuration.
 
 ## Deploy
 
 ```
-docker-compose up
+docker stack deploy --compose-file comanage-registry-mod-auth-openidc-mariadb-stack.yml comanage-registry
 ```
 
 ## Tear Down
 
 ```
-docker-compose down
+docker stack rm comanage-registry
 ```
diff --git a/comanage-registry-stack/comanage-registry-mod-auth-openidc-maridb-stack.yml b/comanage-registry-stack/comanage-registry-mod-auth-openidc-mariadb-stack.yml
similarity index 93%
rename from comanage-registry-stack/comanage-registry-mod-auth-openidc-maridb-stack.yml
rename to comanage-registry-stack/comanage-registry-mod-auth-openidc-mariadb-stack.yml
index 00d29db..af5dc8d 100644
--- a/comanage-registry-stack/comanage-registry-mod-auth-openidc-maridb-stack.yml
+++ b/comanage-registry-stack/comanage-registry-mod-auth-openidc-mariadb-stack.yml
@@ -20,7 +20,7 @@ services:
             replicas: 1
 
     comanage-registry-ldap:
-        image: cilogon/comanage-registry-slapd-cilogon
+        image: sphericalcowgroup/comanage-registry-slapd
         volumes:
             - /opt/slapd-data:/var/lib/ldap
             - /opt/slapd-config:/etc/ldap/slapd.d
@@ -29,8 +29,8 @@ services:
             - SLAPD_PRIVKEY_FILE=/run/secrets/slapd_privkey_file
             - SLAPD_CHAIN_FILE=/run/secrets/slapd_chain_file
             - OLC_ROOT_PW_FILE=/run/secrets/olc_root_pw
-            - OLC_SUFFIX=dc=cilogon,dc=org
-            - OLC_ROOT_DN=cn=admin,dc=cilogon,dc=org
+            - OLC_SUFFIX=dc=my,dc=org
+            - OLC_ROOT_DN=cn=admin,dc=my,dc=org
         secrets:
             - slapd_cert_file
             - slapd_privkey_file
@@ -45,7 +45,7 @@ services:
             replicas: 1
 
     comanage-registry:
-        image: cilogon/comanage-registry:2.0.0-rc3
+        image: sphericalcowgroup/comanage-registry:hotfix-2.0.x-mod-auth-openidc
         volumes:
             - /opt/comanage-registry-local:/local
         environment: