Skip to content
Jump to bottom

livesync for guests, cleanup #135

Merged
merged 1 commit into from
Sep 27, 2022
+48 −15
Merged

livesync for guests, cleanup #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...r/container_files/mp-home/post-initial-objects/resources/100-connector-rest-wordpress.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down
3 changes: 2 additions & 1 deletion ...ch/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...h/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-guest-db.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/>
Expand Down
3 changes: 2 additions & 1 deletion .../midpoint_server/container_files/mp-home/post-initial-objects/resources/100-ldap-main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion ...point_server/container_files/mp-home/post-initial-objects/resources/100-source-hr-sor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ..._server/container_files/mp-home/post-initial-objects/resources/100-source-sis-persons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
4 changes: 2 additions & 2 deletions ..._server/container_files/mp-home/post-initial-objects/tasks/300-task-import-guests-sql.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
28 changes: 28 additions & 0 deletions ...ontainer_files/mp-home/post-initial-objects/tasks/500-task-import-guests-sql-livesync.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

2 changes: 1 addition & 1 deletion ...nt_server/container_files/mp-home/post-initial-objects/tasks/995-task-group-scavenger.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...rver/container_files/mp-home/post-initial-objects/tasks/997-task-async-update-grouper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ainer_files/mp-home/post-initial-objects/tasks/998-task-reconciliation-grouper-groups.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion Workbench/webproxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down