Merge pull request #135 from internet2/pc_Sept2022

livesync for guests, cleanup
internet2 · Sep 27, 2022 · 8aedcc5 · 8aedcc5
2 parents cf1cc3f + 6fe95d9
commit 8aedcc5
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 15 deletions.
diff --git a/...r/container_files/mp-home/post-initial-objects/resources/100-connector-rest-wordpress.xml b/...r/container_files/mp-home/post-initial-objects/resources/100-connector-rest-wordpress.xml
@@ -1,5 +1,6 @@
 <resource xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" oid="dd683dd5-b7b0-414c-a1d9-7039340ad70b" version="34">
-    <name>wordpress</name>
+    <name>Target: Wordpress</name>
+    <description>Wordpress system</description>
     <metadata>
         <modifyTimestamp>2019-03-29T16:22:22.388Z</modifyTimestamp>
         <modifierRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType"/>

diff --git a/...ch/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml b/...ch/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">
 
-    <name>Grouper Resource</name>
+    <name>Source: Groups</name>
+    <description>Groups from Grouper</description>
     <connectorRef type="c:ConnectorType">
         <filter>
             <q:equal>

diff --git a/...h/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-guest-db.xml b/...h/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-guest-db.xml
@@ -1,5 +1,5 @@
 <resource xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oid="edb9e47b-e8ad-48b7-9127-ae7b8911a8f2" version="6">
-    <name>COmanage Guests</name>
+    <name>Source: Guest DB</name>
     <description>Guests from COmanage via SQL</description>
     <iteration>0</iteration>
     <iterationToken/>

diff --git a/.../midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml b/.../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">
 
-	<name>LDAP (directory)</name>
+        <name>Target: LDAP directory</name>
+        <description>Main LDAP directory</description>
 
 	<connectorRef type="ConnectorType">
 		<filter>

diff --git a/...point_server/container_files/mp-home/post-initial-objects/resources/100-source-hr-sor.xml b/...point_server/container_files/mp-home/post-initial-objects/resources/100-source-hr-sor.xml
@@ -8,7 +8,8 @@
 <objects xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3">
     <resource oid="10000000-9999-9999-0000-a000ff000001">
         <!-- Resource name. It will be displayed in GUI.  -->
-        <name>HR SOR Source</name>
+        <name>Source: HR System</name>
+        <description>Staff from HR via CSV</description>
         <!-- Reference to the ICF CSV connector. -->
         <connectorRef type="ConnectorType">
             <filter>

diff --git a/..._server/container_files/mp-home/post-initial-objects/resources/100-source-sis-persons.xml b/..._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">
 
-	<c:name>SQL SIS persons (sources)</c:name>
-
+	<c:name>Source: SIS DB</c:name>
+	<c:description>Students/Faculty from SIS via SQL</c:description>
 	<connectorRef type="ConnectorType">
 		<filter>
 			<q:equal>

diff --git a/...midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml b/...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">
-   <name>Import from HR DB</name>
+   <name>HR: Full Import</name>
    <extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:type="c:ExtensionType">

diff --git a/..._server/container_files/mp-home/post-initial-objects/tasks/300-task-import-guests-sql.xml b/..._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">
-   <name>Import Guests from COmanage SQL</name>
+   <name>Guests: Full Import</name>
    <extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:type="c:ExtensionType">
@@ -31,7 +31,7 @@
               type="c:ResourceType"><!-- Guests from COmanage DB --></objectRef>
    <recurrence>recurring</recurrence>
    <schedule>
-     <interval>60</interval>
+     <interval>1800</interval>
    </schedule>
    <binding>loose</binding>
 </task>

diff --git a/...server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml b/...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">
-   <name>Import from SIS persons</name>
+   <name>SIS: Full Import</name>
    <extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:type="c:ExtensionType">

diff --git a/...ontainer_files/mp-home/post-initial-objects/tasks/500-task-import-guests-sql-livesync.xml b/...ontainer_files/mp-home/post-initial-objects/tasks/500-task-import-guests-sql-livesync.xml
@@ -0,0 +1,28 @@
+<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+      xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+      oid="5a821505-7318-4364-9a2f-501b8bf30b44">
+    <name>Guests: Livesync</name>
+    <description>COmanage SQL live synchronization task. It will poll changelog and pull in changes</description>
+    <ownerRef oid="00000000-0000-0000-0000-000000000002"/>
+    <executionState>running</executionState>
+    <indestructible>true</indestructible>
+    <objectRef oid="edb9e47b-e8ad-48b7-9127-ae7b8911a8f2" type="c:ResourceType"/>
+    <binding>tight</binding>
+    <schedule>
+        <recurrence>recurring</recurrence>
+        <interval>5</interval>
+    </schedule>
+    <activity>
+        <work>
+            <liveSynchronization>
+                <resourceObjects>
+                    <resourceRef oid="edb9e47b-e8ad-48b7-9127-ae7b8911a8f2"/>
+                    <objectclass>AccountObjectClass</objectclass>
+                </resourceObjects>
+            </liveSynchronization>
+        </work>
+    </activity>
+</task>
+
diff --git a/...nt_server/container_files/mp-home/post-initial-objects/tasks/995-task-group-scavenger.xml b/...nt_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">
-	<name>Group Scavenger</name>
+	<name>Groups: Group Scavenger</name>
 	<extension>
 		<scext:executeScript>
 			<s:action>

diff --git a/...rver/container_files/mp-home/post-initial-objects/tasks/997-task-async-update-grouper.xml b/...rver/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">
-	<name>Grouper async updates</name>
+	<name>Groups: Live updates</name>
 	<extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3">
 		<mext:workerThreads>1</mext:workerThreads>
 	</extension>

diff --git a/...ainer_files/mp-home/post-initial-objects/tasks/998-task-reconciliation-grouper-groups.xml b/...ainer_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">
-	<name>Grouper reconciliation (groups)</name>
+	<name>Groups: Full Reconciliation</name>
 	<extension xmlns:mext="http://midpoint.evolveum.com/xml/ns/public/model/extension-3">
 		<mext:objectclass>ri:Group</mext:objectclass>
 	</extension>

diff --git 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