Change grouper daemon to use ENV for rabbitmq password, also task cha…

…ining and recurring task for recompute
internet2 · Jan 6, 2021 · b0034d7 · b0034d7
1 parent b2f58bf
commit b0034d7
Show file tree

Hide file tree

Showing 6 changed files with 211 additions and 7 deletions.
diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml
@@ -12,7 +12,8 @@ services:
      - USERTOKEN
      - GROUPER_CLIENT_WEBSERVICE_PASSWORD_FILE=password
      - GROUPER_DATABASE_PASSWORD_FILE=/run/secrets/g_database_password.txt
-     - RABBITMQ_PASSWORD_FILE=/run/secrets/rabbitmq_password.txt
+     #- RABBITMQ_PASSWORD_FILE=/run/secrets/rabbitmq_password.txt
+     - RABBITMQ_PASSWORD=password
      - SUBJECT_SOURCE_LDAP_PASSWORD=password
     networks:
       net:

diff --git a/...oint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml b/...oint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-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:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3">
+	<org 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="d0b2135a-f6bb-412b-bbef-5b76a1b32e52" version="6">
+    <name>generic_app:wordpress:admins</name>
+    <extension xmlns:gen376="http://grouper-demo.tier.internet2.edu">
+        <gen376:grouperName xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">app:wordpress:admins</gen376:grouperName>
+        <gen376:ldapDn xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">cn=app:wordpress:admins,ou=generic,ou=Groups,dc=internet2,dc=edu</gen376:ldapDn>
+    </extension>
+    <parentOrgRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType">
+        <!-- generic-groups -->
+    </parentOrgRef>
+    <metadata>
+        <requestTimestamp>2020-12-31T16:22:32.989Z</requestTimestamp>
+        <requestorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
+            <!-- administrator -->
+        </requestorRef>
+        <createTimestamp>2020-12-31T16:22:33.049Z</createTimestamp>
+        <creatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
+            <!-- administrator -->
+        </creatorRef>
+        <createChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</createChannel>
+        <createTaskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
+            <!-- Grouper reconciliation (groups) -->
+        </createTaskRef>
+        <modifyTimestamp>2020-12-31T19:08:17.662Z</modifyTimestamp>
+        <modifierRef oid="e897468f-20bd-419c-8fc5-1fe60e2600de" relation="org:default" type="c:UserType">
+            <!-- banderson -->
+        </modifierRef>
+        <modifyChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</modifyChannel>
+        <lastProvisioningTimestamp>2020-12-31T16:22:33.048Z</lastProvisioningTimestamp>
+    </metadata>
+    <lifecycleState>active</lifecycleState>
+    <operationExecution id="4">
+        <timestamp>2020-12-31T18:40:43.115Z</timestamp>
+        <status>success</status>
+        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
+            <!-- administrator -->
+        </initiatorRef>
+        <taskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
+            <!-- Grouper reconciliation (groups) -->
+        </taskRef>
+        <channel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</channel>
+    </operationExecution>
+    <assignment id="1">
+        <metadata>
+            <requestTimestamp>2020-12-31T16:22:32.989Z</requestTimestamp>
+            <requestorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
+                <!-- administrator -->
+            </requestorRef>
+            <createTimestamp>2020-12-31T16:22:33.049Z</createTimestamp>
+            <creatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
+                <!-- administrator -->
+            </creatorRef>
+            <createChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</createChannel>
+            <createTaskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
+                <!-- Grouper reconciliation (groups) -->
+            </createTaskRef>
+        </metadata>
+        <targetRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
+            <!-- generic-grouper-group -->
+        </targetRef>
+        <activation>
+            <effectiveStatus>enabled</effectiveStatus>
+        </activation>
+    </assignment>
+    <iteration>0</iteration>
+    <iterationToken/>
+    <archetypeRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
+        <!-- generic-grouper-group -->
+    </archetypeRef>
+    <roleMembershipRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
+        <!-- generic-grouper-group -->
+    </roleMembershipRef>
+    <roleMembershipRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType">
+        <!-- generic-groups -->
+    </roleMembershipRef>
+    <linkRef oid="ee269e22-a60d-473b-8f2c-00aa3d76d696" relation="org:default" type="c:ShadowType">
+        <!-- app:wordpress:admins -->
+    </linkRef>
+    <linkRef oid="58092e7d-2ed4-475a-b0e7-7bf68e7fa3c8" relation="org:default" type="c:ShadowType">
+        <!-- cn=app:wordpress:admins,ou=Generic,ou=Groups,dc=internet2,dc=edu -->
+    </linkRef>
+    <activation>
+        <effectiveStatus>enabled</effectiveStatus>
+        <enableTimestamp>2020-12-31T16:22:32.989Z</enableTimestamp>
+    </activation>
+    <displayName>app:wordpress:admins</displayName>
+    <identifier>app:wordpress:admins</identifier>
+    <inducement id="5">
+        <targetRef oid="9e5a82fc-7969-4fd8-9f74-e0857969cdbb" relation="org:default" type="c:RoleType">
+            <!-- Metarole Wordpress Admin -->
+        </targetRef>
+    </inducement>
+</org>
+
+</objects>
diff --git a/...int_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml b/...int_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-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:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3">
+	<org 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="6ab6209f-af8f-4949-9d69-c1f6ae94d08e" version="6">
+    <name>generic_app:wordpress:editors</name>
+    <extension xmlns:gen376="http://grouper-demo.tier.internet2.edu">
+        <gen376:grouperName xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">app:wordpress:editors</gen376:grouperName>
+        <gen376:ldapDn xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">cn=app:wordpress:editors,ou=generic,ou=Groups,dc=internet2,dc=edu</gen376:ldapDn>
+    </extension>
+    <parentOrgRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType">
+        <!-- generic-groups -->
+    </parentOrgRef>
+    <metadata>
+        <requestTimestamp>2020-12-31T16:22:33.522Z</requestTimestamp>
+        <requestorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
+            <!-- administrator -->
+        </requestorRef>
+        <createTimestamp>2020-12-31T16:22:33.571Z</createTimestamp>
+        <creatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
+            <!-- administrator -->
+        </creatorRef>
+        <createChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</createChannel>
+        <createTaskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
+            <!-- Grouper reconciliation (groups) -->
+        </createTaskRef>
+        <modifyTimestamp>2020-12-31T19:49:09.090Z</modifyTimestamp>
+        <modifierRef oid="e897468f-20bd-419c-8fc5-1fe60e2600de" relation="org:default" type="c:UserType">
+            <!-- banderson -->
+        </modifierRef>
+        <modifyChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</modifyChannel>
+        <lastProvisioningTimestamp>2020-12-31T16:22:33.570Z</lastProvisioningTimestamp>
+    </metadata>
+    <lifecycleState>active</lifecycleState>
+    <operationExecution id="4">
+        <timestamp>2020-12-31T18:40:43.183Z</timestamp>
+        <status>success</status>
+        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
+            <!-- administrator -->
+        </initiatorRef>
+        <taskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
+            <!-- Grouper reconciliation (groups) -->
+        </taskRef>
+        <channel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</channel>
+    </operationExecution>
+    <assignment id="1">
+        <metadata>
+            <requestTimestamp>2020-12-31T16:22:33.522Z</requestTimestamp>
+            <requestorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
+                <!-- administrator -->
+            </requestorRef>
+            <createTimestamp>2020-12-31T16:22:33.571Z</createTimestamp>
+            <creatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
+                <!-- administrator -->
+            </creatorRef>
+            <createChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</createChannel>
+            <createTaskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
+                <!-- Grouper reconciliation (groups) -->
+            </createTaskRef>
+        </metadata>
+        <targetRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
+            <!-- generic-grouper-group -->
+        </targetRef>
+        <activation>
+            <effectiveStatus>enabled</effectiveStatus>
+        </activation>
+    </assignment>
+    <iteration>0</iteration>
+    <iterationToken/>
+    <archetypeRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
+        <!-- generic-grouper-group -->
+    </archetypeRef>
+    <roleMembershipRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
+        <!-- generic-grouper-group -->
+    </roleMembershipRef>
+    <roleMembershipRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType">
+        <!-- generic-groups -->
+    </roleMembershipRef>
+    <linkRef oid="9ac441d5-1832-4f4e-a536-d5b2dba35cb5" relation="org:default" type="c:ShadowType">
+        <!-- app:wordpress:editors -->
+    </linkRef>
+    <linkRef oid="bfd8c935-28b8-431b-88a0-4842027dc483" relation="org:default" type="c:ShadowType">
+        <!-- cn=app:wordpress:editors,ou=Generic,ou=Groups,dc=internet2,dc=edu -->
+    </linkRef>
+    <activation>
+        <effectiveStatus>enabled</effectiveStatus>
+        <enableTimestamp>2020-12-31T16:22:33.523Z</enableTimestamp>
+    </activation>
+    <displayName>app:wordpress:editors</displayName>
+    <identifier>app:wordpress:editors</identifier>
+    <inducement id="5">
+        <targetRef oid="30082d24-0bea-4f22-b558-d0ee2a399c38" relation="org:default" type="c:RoleType">
+            <!-- Metarole Wordpress Editor -->
+        </targetRef>
+    </inducement>
+</org>
+
+</objects>
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
@@ -25,6 +25,7 @@
              relation="org:default"
              type="c:UserType"><!-- administrator --></ownerRef>
    <executionStatus>runnable</executionStatus>
+   <dependent>1494860531232132-0-1</dependent>
    <category>ImportingAccounts</category>
    <objectRef oid="4d70a0da-02dd-41cf-b0a1-00e75d3eaa15"
               relation="org:default"

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
@@ -26,11 +26,13 @@
 	<assignment>
 		<targetRef oid="00000000-0000-0000-0000-000000000501" type="ArchetypeType" /> <!-- Reconciliation task -->
 	</assignment>
-	<taskIdentifier>605a0127-a313-442a-9d5e-151eac8b0745</taskIdentifier>
 	<ownerRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
 		<!-- administrator -->
 	</ownerRef>
-	<executionStatus>runnable</executionStatus>
+   <dependent>1494860531232132-0-2</dependent>
+    <taskIdentifier>1494860531232132-0-1</taskIdentifier>
+	<executionStatus>waiting</executionStatus>
+   <waitingReason>otherTasks</waitingReason>
 	<category>Reconciliation</category>
 	<objectRef oid="1eff65de-5bb6-483d-9edf-8cc2c2ee0233" relation="org:default" type="c:ResourceType">
 		<!-- Grouper Resource -->

diff --git a/...erver/container_files/mp-home/post-initial-objects/tasks/999-task-recomputation-users.xml b/...erver/container_files/mp-home/post-initial-objects/tasks/999-task-recomputation-users.xml
@@ -10,13 +10,17 @@
     <assignment>
         <targetRef oid="00000000-0000-0000-0000-000000000502" type="ArchetypeType"/> <!--Recomputation task -->
     </assignment>
-    <taskIdentifier>1571729899646-0-1</taskIdentifier>
     <ownerRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
         <!-- administrator -->
     </ownerRef>
     <channel>http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#recompute</channel>
-    <executionStatus>runnable</executionStatus>
+    <taskIdentifier>1494860531232132-0-2</taskIdentifier>
+   <executionStatus>waiting</executionStatus>
+   <waitingReason>otherTasks</waitingReason>
     <category>Recomputation</category>
-    <recurrence>single</recurrence>
-    <binding>tight</binding>
+      <recurrence>recurring</recurrence>
+    <binding>loose</binding>
+    <schedule>
+        <interval>300</interval>
+    </schedule>
 </task>