From 6fe95d9fdb1983ed1ad8bfe9fa739ff026ddee7a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 27 Sep 2022 15:35:06 +0000 Subject: [PATCH] livesync for guests, cleanup --- .../100-connector-rest-wordpress.xml | 3 +- .../resources/100-grouper.xml | 3 +- .../resources/100-guest-db.xml | 2 +- .../resources/100-ldap-main.xml | 3 +- .../resources/100-source-hr-sor.xml | 3 +- .../resources/100-source-sis-persons.xml | 4 +-- .../tasks/300-task-hr-import.xml | 2 +- .../tasks/300-task-import-guests-sql.xml | 4 +-- .../tasks/300-task-import-sis-persons.xml | 2 +- .../500-task-import-guests-sql-livesync.xml | 28 +++++++++++++++++++ .../tasks/995-task-group-scavenger.xml | 2 +- .../tasks/997-task-async-update-grouper.xml | 2 +- ...998-task-reconciliation-grouper-groups.xml | 2 +- Workbench/webproxy/Dockerfile | 3 +- 14 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/500-task-import-guests-sql-livesync.xml diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-connector-rest-wordpress.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-connector-rest-wordpress.xml index 80ac37a..19c9e36 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-connector-rest-wordpress.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-connector-rest-wordpress.xml @@ -1,5 +1,6 @@ - wordpress + Target: Wordpress + Wordpress system 2019-03-29T16:22:22.388Z diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml index 3871d52..d57f3c0 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml @@ -18,7 +18,8 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - Grouper Resource + Source: Groups + Groups from Grouper diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-guest-db.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-guest-db.xml index f79991c..3ed5436 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-guest-db.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-guest-db.xml @@ -1,5 +1,5 @@ - COmanage Guests + Source: Guest DB Guests from COmanage via SQL 0 diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml index 0a84e3c..2b065ed 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml @@ -16,7 +16,8 @@ xmlns:mr="http://prism.evolveum.com/xml/ns/public/matching-rule-3" xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3"> - LDAP (directory) + Target: LDAP directory + Main LDAP directory diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-source-hr-sor.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-source-hr-sor.xml index 6b24c97..c37ac9a 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-source-hr-sor.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-source-hr-sor.xml @@ -8,7 +8,8 @@ - HR SOR Source + Source: HR System + Staff from HR via CSV diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-source-sis-persons.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-source-sis-persons.xml index 7df8a8e..b9956e0 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-source-sis-persons.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-source-sis-persons.xml @@ -19,8 +19,8 @@ xmlns:mr="http://prism.evolveum.com/xml/ns/public/matching-rule-3" xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3"> - SQL SIS persons (sources) - + Source: SIS DB + Students/Faculty from SIS via SQL diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml index f0ce3bd..a05dace 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml @@ -6,7 +6,7 @@ xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" oid="62b23d51-8b36-454a-af39-45e078a4563f"> - Import from HR DB + HR: Full Import diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-guests-sql.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-guests-sql.xml index 015a0bc..aa58b27 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-guests-sql.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-guests-sql.xml @@ -6,7 +6,7 @@ xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" oid="9ddfc0ff-6293-4f34-8eb7-5a049c21480f"> - Import Guests from COmanage SQL + Guests: Full Import @@ -31,7 +31,7 @@ type="c:ResourceType"> recurring - 60 + 1800 loose diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml index aed7c83..d32a38d 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml @@ -6,7 +6,7 @@ xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" oid="22c2a3d0-0961-4255-9eec-c550a79aeaaa"> - Import from SIS persons + SIS: Full Import diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/500-task-import-guests-sql-livesync.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/500-task-import-guests-sql-livesync.xml new file mode 100644 index 0000000..331de02 --- /dev/null +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/500-task-import-guests-sql-livesync.xml @@ -0,0 +1,28 @@ + + Guests: Livesync + COmanage SQL live synchronization task. It will poll changelog and pull in changes + + running + true + + tight + + recurring + 5 + + + + + + + AccountObjectClass + + + + + + diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/995-task-group-scavenger.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/995-task-group-scavenger.xml index 50c98af..a4213aa 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/995-task-group-scavenger.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/995-task-group-scavenger.xml @@ -21,7 +21,7 @@ Looks for groups with the lifecycleState of 'retired' and completes their deleti xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3" xmlns:scext="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3" oid="1d7bef40-953e-443e-8e9a-ec6e313668c4"> - Group Scavenger + Groups: Group Scavenger diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/997-task-async-update-grouper.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/997-task-async-update-grouper.xml index 5007ae4..fbd150f 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/997-task-async-update-grouper.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/997-task-async-update-grouper.xml @@ -18,7 +18,7 @@ xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" oid="47fc57bd-8c34-4555-9b9f-7087ff179860"> - Grouper async updates + Groups: Live updates 1 diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/998-task-reconciliation-grouper-groups.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/998-task-reconciliation-grouper-groups.xml index 00d3c5c..5180680 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/998-task-reconciliation-grouper-groups.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/998-task-reconciliation-grouper-groups.xml @@ -19,7 +19,7 @@ xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" oid="605a0127-a313-442a-9d5e-151eac8b0745"> - Grouper reconciliation (groups) + Groups: Full Reconciliation ri:Group diff --git a/Workbench/webproxy/Dockerfile b/Workbench/webproxy/Dockerfile index 039d732..0552213 100644 --- a/Workbench/webproxy/Dockerfile +++ b/Workbench/webproxy/Dockerfile @@ -34,7 +34,8 @@ COPY container_files/mdload/ /mdload/ RUN chmod 755 /usr/local/bin/startWithMDLoad.sh && chmod 755 /mdload/*.sh #install updated curl (for --data-raw) -RUN rpm -Uvh http://www.city-fan.org/ftp/contrib/yum-repo/city-fan.org-release-3-3.rhel7.noarch.rpm +# see http://www.city-fan.org/ftp/contrib/yum-repo/ for more info and for correct version numbers +RUN rpm -Uvh http://www.city-fan.org/ftp/contrib/yum-repo/city-fan.org-release-3-4.rhel7.noarch.rpm RUN yum-config-manager --enable city-fan.org RUN yum update curl -y