From ebbb8452d2431fe406e0797cd8d7bb75bf5453d7 Mon Sep 17 00:00:00 2001 From: Ethan Kromhout Date: Mon, 4 Jan 2021 11:29:07 -0500 Subject: [PATCH 1/2] Wordpress provisioning --- .../container_files/bootstrap/initialize.gsh | 2 ++ .../100-connector-rest-wordpress.xml | 10 ++++-- .../200-metarole-role-wordpress-editor.xml | 2 +- ...ort.xml => 300-task-guest-ldap-import.xml} | 0 ...k-hr-import.xml => 300-task-hr-import.xml} | 0 .../tasks/300-task-import-sis-persons.xml | 34 +++++++++++++++++++ 6 files changed, 44 insertions(+), 4 deletions(-) rename Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/{994-task-guest-ldap-import.xml => 300-task-guest-ldap-import.xml} (100%) rename Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/{993-task-hr-import.xml => 300-task-hr-import.xml} (100%) create mode 100644 Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml diff --git a/Workbench/grouper_data/container_files/bootstrap/initialize.gsh b/Workbench/grouper_data/container_files/bootstrap/initialize.gsh index 844a49a..ed6ec7e 100644 --- a/Workbench/grouper_data/container_files/bootstrap/initialize.gsh +++ b/Workbench/grouper_data/container_files/bootstrap/initialize.gsh @@ -25,6 +25,8 @@ attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperL attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapSubjectAttributeName(), "uniqueMember") attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapSubjectIdTypeName(), "subjectId") +admins = new GroupSave(gs).assignName("app:wordpress:admins").assignCreateParentStemsIfNotExist(true).save() +editors = new GroupSave(gs).assignName("app:wordpress:editors").assignCreateParentStemsIfNotExist(true).save() chess = new GroupSave(gs).assignName("app:mailinglist:chess").assignCreateParentStemsIfNotExist(true).save() idmfans = new GroupSave(gs).assignName("app:mailinglist:idm-fans").assignCreateParentStemsIfNotExist(true).save() cs = new GroupSave(gs).assignName("app:cs").assignCreateParentStemsIfNotExist(true).save() 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 d692fbc..1857d2f 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 @@ -313,9 +313,13 @@ - - - + + + + + + + diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-editor.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-editor.xml index 65292a6..2f2bc15 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-editor.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-editor.xml @@ -2,7 +2,7 @@ - + Metarole Wordpress Editor 2020-07-20T14:36:12.953Z diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/994-task-guest-ldap-import.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-guest-ldap-import.xml similarity index 100% rename from Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/994-task-guest-ldap-import.xml rename to Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-guest-ldap-import.xml diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/993-task-hr-import.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml similarity index 100% rename from Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/993-task-hr-import.xml rename to Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-hr-import.xml 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 new file mode 100644 index 0000000..58189c0 --- /dev/null +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/300-task-import-sis-persons.xml @@ -0,0 +1,34 @@ + + Import from SIS persons + + account + ri:AccountObjectClass + + + + + + 1535407239440-0-1 + + runnable + ImportingAccounts + + single + loose + From b0034d7c033bffb2f3279bf6582efd4e02b6efe3 Mon Sep 17 00:00:00 2001 From: Ethan Kromhout Date: Wed, 6 Jan 2021 14:38:39 -0500 Subject: [PATCH 2/2] Change grouper daemon to use ENV for rabbitmq password, also task chaining and recurring task for recompute --- Workbench/docker-compose.yml | 3 +- .../orgs/700-org-wordpress-admin.xml | 98 +++++++++++++++++++ .../orgs/700-org-wordpress-editor.xml | 98 +++++++++++++++++++ .../tasks/300-task-import-sis-persons.xml | 1 + ...998-task-reconciliation-grouper-groups.xml | 6 +- .../tasks/999-task-recomputation-users.xml | 12 ++- 6 files changed, 211 insertions(+), 7 deletions(-) create mode 100644 Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml create mode 100644 Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml index 1f9fb60..3ebb492 100644 --- 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/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml new file mode 100644 index 0000000..5d9984b --- /dev/null +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml @@ -0,0 +1,98 @@ + + + + generic_app:wordpress:admins + + app:wordpress:admins + cn=app:wordpress:admins,ou=generic,ou=Groups,dc=internet2,dc=edu + + + + + + 2020-12-31T16:22:32.989Z + + + + 2020-12-31T16:22:33.049Z + + + + http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation + + + + 2020-12-31T19:08:17.662Z + + + + http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user + 2020-12-31T16:22:33.048Z + + active + + 2020-12-31T18:40:43.115Z + success + + + + + + + http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation + + + + 2020-12-31T16:22:32.989Z + + + + 2020-12-31T16:22:33.049Z + + + + http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation + + + + + + + + + enabled + + + 0 + + + + + + + + + + + + + + + + + + enabled + 2020-12-31T16:22:32.989Z + + app:wordpress:admins + app:wordpress:admins + + + + + + + + \ No newline at end of file diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml new file mode 100644 index 0000000..19e245e --- /dev/null +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml @@ -0,0 +1,98 @@ + + + + generic_app:wordpress:editors + + app:wordpress:editors + cn=app:wordpress:editors,ou=generic,ou=Groups,dc=internet2,dc=edu + + + + + + 2020-12-31T16:22:33.522Z + + + + 2020-12-31T16:22:33.571Z + + + + http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation + + + + 2020-12-31T19:49:09.090Z + + + + http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user + 2020-12-31T16:22:33.570Z + + active + + 2020-12-31T18:40:43.183Z + success + + + + + + + http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation + + + + 2020-12-31T16:22:33.522Z + + + + 2020-12-31T16:22:33.571Z + + + + http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation + + + + + + + + + enabled + + + 0 + + + + + + + + + + + + + + + + + + enabled + 2020-12-31T16:22:33.523Z + + app:wordpress:editors + app:wordpress:editors + + + + + + + + \ No newline at end of file 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 58189c0..aed7c83 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 @@ -25,6 +25,7 @@ relation="org:default" type="c:UserType"> runnable + 1494860531232132-0-1 ImportingAccounts - 605a0127-a313-442a-9d5e-151eac8b0745 - runnable + 1494860531232132-0-2 + 1494860531232132-0-1 + waiting + otherTasks Reconciliation diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/999-task-recomputation-users.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/999-task-recomputation-users.xml index 179b565..1c26f95 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/999-task-recomputation-users.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/tasks/999-task-recomputation-users.xml @@ -10,13 +10,17 @@ - 1571729899646-0-1 http://midpoint.evolveum.com/xml/ns/public/provisioning/channels-3#recompute - runnable + 1494860531232132-0-2 + waiting + otherTasks Recomputation - single - tight + recurring + loose + + 300 +