From 32deb7c95563708328c11fc88b76a893d8158e71 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 13 Apr 2021 20:13:38 +0000 Subject: [PATCH 1/2] update COmanage --- Workbench/comanage/Dockerfile | 2 +- Workbench/comanage_cron/Dockerfile | 2 +- Workbench/webproxy/container_files/httpd/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Workbench/comanage/Dockerfile b/Workbench/comanage/Dockerfile index f55d257..f25eb18 100644 --- a/Workbench/comanage/Dockerfile +++ b/Workbench/comanage/Dockerfile @@ -1,4 +1,4 @@ -FROM i2incommon/comanage-registry:3.3.1-20201026 +FROM i2incommon/comanage-registry:3.3.2-20210318 ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson diff --git a/Workbench/comanage_cron/Dockerfile b/Workbench/comanage_cron/Dockerfile index 69c5cd5..e819b2c 100644 --- a/Workbench/comanage_cron/Dockerfile +++ b/Workbench/comanage_cron/Dockerfile @@ -1,4 +1,4 @@ -FROM i2incommon/comanage-registry-cron:3.3.1-20201026 +FROM i2incommon/comanage-registry-cron:3.3.2-20210318 ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html index 3a316f9..50e5bf9 100644 --- a/Workbench/webproxy/container_files/httpd/index.html +++ b/Workbench/webproxy/container_files/httpd/index.html @@ -10,7 +10,7 @@

Welcome to the InCommon TAP Workbench!


From 61e7507e6cbb8c074c0ca35876c204be52abbd37 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 13 Apr 2021 20:26:20 +0000 Subject: [PATCH 2/2] update default cert --- .../container_files/httpd/localhost.crt | 41 ++++++++------- .../container_files/httpd/localhost.key | 50 +++++++++---------- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/Workbench/webproxy/container_files/httpd/localhost.crt b/Workbench/webproxy/container_files/httpd/localhost.crt index 881c325..38449fb 100644 --- a/Workbench/webproxy/container_files/httpd/localhost.crt +++ b/Workbench/webproxy/container_files/httpd/localhost.crt @@ -1,23 +1,22 @@ -----BEGIN CERTIFICATE----- -MIID6jCCAtKgAwIBAgICaaIwDQYJKoZIhvcNAQELBQAwgakxCzAJBgNVBAYTAi0t -MRIwEAYDVQQIDAlTb21lU3RhdGUxETAPBgNVBAcMCFNvbWVDaXR5MRkwFwYDVQQK -DBBTb21lT3JnYW5pemF0aW9uMR8wHQYDVQQLDBZTb21lT3JnYW5pemF0aW9uYWxV -bml0MRUwEwYDVQQDDAxiYWFhMWFiNTE0NGExIDAeBgkqhkiG9w0BCQEWEXJvb3RA -YmFhYTFhYjUxNDRhMB4XDTIwMDQyMTE4NTkwN1oXDTIxMDQyMTE4NTkwN1owgakx -CzAJBgNVBAYTAi0tMRIwEAYDVQQIDAlTb21lU3RhdGUxETAPBgNVBAcMCFNvbWVD -aXR5MRkwFwYDVQQKDBBTb21lT3JnYW5pemF0aW9uMR8wHQYDVQQLDBZTb21lT3Jn -YW5pemF0aW9uYWxVbml0MRUwEwYDVQQDDAxiYWFhMWFiNTE0NGExIDAeBgkqhkiG -9w0BCQEWEXJvb3RAYmFhYTFhYjUxNDRhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEArzuaMkF/83JBHj8mQMm5jhKLSSC+viuisAxNHGHM6j33lJl9ls4R -iUBnbW4sTW4l1uYMfKZJKr5y9msTQXu8+CCON7oscUvFuc/D8gRb/J9QmJK188Cr -L6DS+ofZXZqqV4Ou5FKjOax7gOvAMAGV7x4F9qEfdy8SyjSjhK5+57BaboH/PgLY -qu0i7SJ+NzkGq7M0lt/DdqGZazOQbBhaoryB/hvo7JgSbxAfhVqQdtkcidSsNbBA -/+PLlk1+hhOhiA15h/laA854T6FNYyeurEyr530zUo7P4/PZZyu/7y4D+s8KlNt3 -zpfVy9hNXgxFRCpLBC4XWLVwYmT18DfHIQIDAQABoxowGDAJBgNVHRMEAjAAMAsG -A1UdDwQEAwIF4DANBgkqhkiG9w0BAQsFAAOCAQEAJcmopkftBDCpVW8GmtlD23o6 -oBOAnD566BK5zA23R9QDyoTX2Roz6moXxMrY3tlgL4LO/2prrR70vBIG6zn5q/xG -goAwnWcQmFSg3HhiVJlcjRNrBEIbYw2edeZC38r6sWVj50RFCtlCMIaDdRAZCiVy -Avf+S2Dw1QD9urkdjTMQaogMNmjZiXxKB2Zteqnks3JEVpOdlnLZYObIvSa1leIP -gw4HgTllV1IqOJtgciczBX3xr8l6WR730BOv39ciGk25R4DQZxR/dR61NpnaYYuz -8Rb+n48KaBe3vcxDtgAP8skFf1FN72bMOxrSYy6TEcN4URUMK4ybcXvLVKWEjg== +MIIDnzCCAoegAwIBAgIJAICPzWSqr8oQMA0GCSqGSIb3DQEBCwUAMGYxCzAJBgNV +BAYTAi0tMRIwEAYDVQQIDAlTb21lU3RhdGUxETAPBgNVBAcMCFNvbWVDaXR5MRkw +FwYDVQQKDBBTb21lT3JnYW5pemF0aW9uMRUwEwYDVQQDDAxiYWFhMWFiNTE0NGEw +HhcNMjEwNDEzMjAyMjU0WhcNMjMwNDEzMjAyMjU0WjBmMQswCQYDVQQGEwItLTES +MBAGA1UECAwJU29tZVN0YXRlMREwDwYDVQQHDAhTb21lQ2l0eTEZMBcGA1UECgwQ +U29tZU9yZ2FuaXphdGlvbjEVMBMGA1UEAwwMYmFhYTFhYjUxNDRhMIIBIjANBgkq +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx6sabg+Oi6s4Bl/EEQ1KzJB2so9DnGgU +HJH0wPUF55HQ9S5gOe4IEv3j0Msvg4wjwRcwlr0mOWaXYhqzhNznCzUgy0ct/PD1 +zY2jn6pTZAY+AXPh3vx90bAyRnuiDhaOIdpn0B+5HyOTg5gMCq+z93q0aCniFted +VA0ztzRqcQuM7IXoxNN2YIF/eQJ+gbLtAzWSOPhMTU/Go2BdXsyVYAUwwrQrGQU7 +BxNRwXsOdWyU0ST+9ot7KQ0SP1MrYD0fxNrNdDXtHbLs/rGpvfQ991zvya+Jwb+W +RlfjDJmm94I8ePFk4iaVJAEDxSfRfswEdBsgvhBaTYl4rvqz6WwYxQIDAQABo1Aw +TjAdBgNVHQ4EFgQUoS1eGluEUpxOVaSekZwQ3KdY9XcwHwYDVR0jBBgwFoAUoS1e +GluEUpxOVaSekZwQ3KdY9XcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC +AQEAgiP5nc3L18KETthXieMvAjD8RdvDaAKBWRFARIq0o0en0woXdL4Wme+1gnYT ++Xnup6g6/oDFc96S4atNPuc4DZYcRt/jPiIBV3lHQfUeg7BGll7e8H3HltiIpDWT +uWUoah7vTmZ+TPGUGz4giryTrvTZOYpVh64Z7Zw2h0T/Z3tzsm+u7hrgnRhopkgK +S9CdVFrjPsXEXR6xgkc+9MMp8gm9jE8zCWtchUuRJ4U8NzU7Gis+Iv/FV2U20zMu +4kLztJG8DPTgNZQrQSa6BZZDgIAEuA9frTY0ZXu+T2US4YSaEwPU7StS3bxHM9Rl +E80fmNm6AJm9ZttThX3wRZTR5Q== -----END CERTIFICATE----- diff --git a/Workbench/webproxy/container_files/httpd/localhost.key b/Workbench/webproxy/container_files/httpd/localhost.key index a307941..2225429 100644 --- a/Workbench/webproxy/container_files/httpd/localhost.key +++ b/Workbench/webproxy/container_files/httpd/localhost.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY-----