From 421ddc119784f15702f0fec1d05842578a1d3a8e Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Tue, 8 Dec 2020 16:55:39 +0000
Subject: [PATCH 1/3] adding comanage cron container

---
 .../container_files/system/root-crontab              |  4 ++++
 .../container_files/system/runcomangejob.sh          | 12 ++++++++++++
 Workbench/docker-compose.yml                         | 11 +++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 Workbench/comanage_cron/container_files/system/root-crontab
 create mode 100644 Workbench/comanage_cron/container_files/system/runcomangejob.sh

diff --git a/Workbench/comanage_cron/container_files/system/root-crontab b/Workbench/comanage_cron/container_files/system/root-crontab
new file mode 100644
index 0000000..5e3a594
--- /dev/null
+++ b/Workbench/comanage_cron/container_files/system/root-crontab
@@ -0,0 +1,4 @@
+* * * * *  /usr/local/bin/runcomangejob.sh 1
+* * * * *  /usr/local/bin/runcomangejob.sh 2 
+# Deprecated job to run expirations, syncorgsources, and groupvalidity tasks (until Registry v4.0.0)
+0 * * * *  /usr/local/bin/runcomangejob.sh
diff --git a/Workbench/comanage_cron/container_files/system/runcomangejob.sh b/Workbench/comanage_cron/container_files/system/runcomangejob.sh
new file mode 100644
index 0000000..b5ca34b
--- /dev/null
+++ b/Workbench/comanage_cron/container_files/system/runcomangejob.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "$#" -ne 1 ]; 
+    then 
+    echo Executing job to run expirations, syncorgsources, and groupvalidity tasks
+    cd /srv/comanage-registry/app && Console/cake job -q
+    exit
+fi
+
+echo Executing job shell for CO number $1
+cd /srv/comanage-registry/app && Console/cake job -q -r -c $1
+echo Done executing job shell for CO number $1
diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml
index e333f8b..6df1b5c 100644
--- a/Workbench/docker-compose.yml
+++ b/Workbench/docker-compose.yml
@@ -344,6 +344,17 @@ services:
      - source: c_sp-key.pem
        target: shib_sp-key.pem
 
+  comanage-cron:
+    build: 
+      context: ./comanage_cron/
+      args:
+        - CSPHOSTNAME
+    environment:
+     - ENV
+     - USERTOKEN
+    networks:
+     - net
+
 networks:
   net:    
     driver: bridge

From cff00afb0441523c9f7c2256a470cc1b641e88f5 Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Tue, 8 Dec 2020 16:56:52 +0000
Subject: [PATCH 2/3] comanage cron

---
 Workbench/comanage_cron/Dockerfile | 41 ++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 Workbench/comanage_cron/Dockerfile

diff --git a/Workbench/comanage_cron/Dockerfile b/Workbench/comanage_cron/Dockerfile
new file mode 100644
index 0000000..4a0a411
--- /dev/null
+++ b/Workbench/comanage_cron/Dockerfile
@@ -0,0 +1,41 @@
+FROM i2incommon/comanage-registry:3.3.1-20201026
+
+ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson
+ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson
+ENV COMANAGE_REGISTRY_DATASOURCE=Database/Mysql
+ENV COMANAGE_REGISTRY_DATABASE=registry
+ENV COMANAGE_REGISTRY_DATABASE_HOST=comanage-data
+ENV COMANAGE_REGISTRY_DATABASE_USER=registry_user
+ENV COMANAGE_REGISTRY_DATABASE_USER_PASSWORD=123321
+ENV COMANAGE_REGISTRY_EMAIL_FROM=xxxx@example.edu
+ENV COMANAGE_REGISTRY_EMAIL_TRANSPORT=Smtp
+ENV COMANAGE_REGISTRY_EMAIL_PORT=25
+ENV COMANAGE_REGISTRY_EMAIL_HOST=smtp.example.edu
+#ENV HTTPS_CERT_FILE=/etc/pki/tls/certs/localhost.crt
+#ENV HTTPS_PRIVKEY_FILE=/etc/pki/tls/private/localhost.key
+# COMANAGE_REGISTRY_SECURITY_SALT - autogenerated if not specified
+# COMANAGE_REGISTRY_SECURITY_SEED - autogenerated if not specified
+#ENV SHIBBOLETH_SP_CERT=/etc/shibboleth/sp-cert.pem
+#ENV SHIBBOLETH_SP_PRIVKEY=/etc/shibboleth/sp-key.pem
+#ENV SHIBBOLETH_SP_ENTITY_ID=comanage.example.edu
+#ENV SHIBBOLETH_SP_METADATA_PROVIDER_XML=sdf
+#ENV SHIBBOLETH_SP_SAMLDS_URL=thing
+
+RUN yum -y update && yum -y install --setopt=tsflags=nodocs epel-release python-pip && pip install awscli && pip install --upgrade pip
+
+ARG maintainer=my
+ARG imagename=comanage
+ARG version=3.3.1
+ARG CSPHOSTNAME=localhost
+ENV CSPHOSTNAME=$CSPHOSTNAME
+ENV COMANAGE_REGISTRY_VIRTUAL_HOST_FQDN=$CSPHOSTNAME
+
+LABEL Version=$version
+ENV VERSION=$version
+
+COPY runcomangejob.sh /usr/local/bin/
+COPY --chown=root:root root-crontab /usr/local/etc
+RUN chmod 755 /usr/local/bin/runcomangejob.sh && \
+    /usr/bin/crontab -u root /usr/local/etc/root-crontab
+
+

From 32442ad11efd88b8235fae02d1301293c6ac0bcd Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Tue, 8 Dec 2020 16:59:07 +0000
Subject: [PATCH 3/3] update container FROM

---
 Workbench/comanage_cron/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Workbench/comanage_cron/Dockerfile b/Workbench/comanage_cron/Dockerfile
index 4a0a411..3e2bd47 100644
--- a/Workbench/comanage_cron/Dockerfile
+++ b/Workbench/comanage_cron/Dockerfile
@@ -1,4 +1,4 @@
-FROM i2incommon/comanage-registry:3.3.1-20201026
+FROM i2incommon/comanage-registry-cron:3.3.1-20201026
 
 ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson
 ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson