From 879dc3fcb6fa8dd42c57fa0c04d550eb3e73a0c5 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Thu, 31 Dec 2020 10:12:49 -0600 Subject: [PATCH 1/8] Update rabbitmq_password.txt --- .../grouper/application/rabbitmq_password.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Workbench/configs-and-secrets/grouper/application/rabbitmq_password.txt b/Workbench/configs-and-secrets/grouper/application/rabbitmq_password.txt index 158f675..f3097ab 100644 --- a/Workbench/configs-and-secrets/grouper/application/rabbitmq_password.txt +++ b/Workbench/configs-and-secrets/grouper/application/rabbitmq_password.txt @@ -1 +1 @@ -guest \ No newline at end of file +password From b1874f4eca58a8f35ad1a72561792d881b1359fc Mon Sep 17 00:00:00 2001 From: Ethan Kromhout Date: Thu, 31 Dec 2020 11:42:43 -0500 Subject: [PATCH 2/8] Changed docker-compose command for grouper_daemon from startup.sh to exec daemon --- Workbench/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml index e7bd3eb..1f9fb60 100644 --- a/Workbench/docker-compose.yml +++ b/Workbench/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.3" services: grouper_daemon: build: ./grouper_daemon/ - command: bash -c "while ! curl -s grouper_data:3306 > /dev/null; do echo waiting for mysql on grouper_data to start; sleep 3; done; while ! curl -s ldap://directory:389 > /dev/null; do echo waiting for ldap on directory to start; sleep 3; done; /usr/local/bin/startup.sh" + command: bash -c "while ! curl -s grouper_data:3306 > /dev/null; do echo waiting for mysql on grouper_data to start; sleep 3; done; while ! curl -s ldap://directory:389 > /dev/null; do echo waiting for ldap on directory to start; sleep 3; done; exec daemon" depends_on: - grouper_data - directory From d43b6f7d9dfdba78149dbd50a2e6ccc855831f1e Mon Sep 17 00:00:00 2001 From: Ethan Kromhout Date: Thu, 31 Dec 2020 13:07:21 -0500 Subject: [PATCH 3/8] Adding trigger to each user in grouper resource during reconciliation --- .../resources/100-grouper.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) 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 9b5b20e..7842c66 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 @@ -136,6 +136,28 @@ ri:member explicit indexOnly + + + + + From 31070f591092c05ec9d4951594ec42191057fe85 Mon Sep 17 00:00:00 2001 From: Ethan Kromhout Date: Thu, 31 Dec 2020 13:43:22 -0500 Subject: [PATCH 4/8] Adding trigger to each user in grouper resource during reconciliation --- .../resources/100-grouper.xml | 22 ------------------- .../resources/100-source-sis-persons.xml | 20 +++++++++++++++++ 2 files changed, 20 insertions(+), 22 deletions(-) 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 7842c66..9b5b20e 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 @@ -136,28 +136,6 @@ ri:member explicit indexOnly - - - - - 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 0ca8cb0..9652c35 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 @@ -79,6 +79,26 @@ ri:uid UID + + + name From c1753c5e5d8f29654dadebfeda7e28f604a83e46 Mon Sep 17 00:00:00 2001 From: Ethan Kromhout Date: Thu, 31 Dec 2020 14:37:13 -0500 Subject: [PATCH 5/8] Rolling back addition of triggers in sis resource --- .../resources/100-source-sis-persons.xml | 20 ------------------- 1 file changed, 20 deletions(-) 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 9652c35..0ca8cb0 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 @@ -79,26 +79,6 @@ ri:uid UID - - - name From ebbb8452d2431fe406e0797cd8d7bb75bf5453d7 Mon Sep 17 00:00:00 2001 From: Ethan Kromhout Date: Mon, 4 Jan 2021 11:29:07 -0500 Subject: [PATCH 6/8] 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 f3edb9c2edf9c25c3cc6cdcc3177583a14cf8006 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 6 Jan 2021 14:22:51 -0500 Subject: [PATCH 7/8] nocanon --- Workbench/webproxy/container_files/httpd/proxy.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Workbench/webproxy/container_files/httpd/proxy.conf b/Workbench/webproxy/container_files/httpd/proxy.conf index 74d8d52..de7c1fb 100644 --- a/Workbench/webproxy/container_files/httpd/proxy.conf +++ b/Workbench/webproxy/container_files/httpd/proxy.conf @@ -50,7 +50,7 @@ ProxyPass /css http://mq:15672/css ProxyPassReverse /css http://mq:15672/css ProxyPass /img http://mq:15672/img ProxyPassReverse /img http://mq:15672/img -ProxyPass /api http://mq:15672/api +ProxyPass /api http://mq:15672/api nocanon ProxyPassReverse /api http://mq:15672/api ProxyPass /ldapadmin https://directory/ldapadmin From b0034d7c033bffb2f3279bf6582efd4e02b6efe3 Mon Sep 17 00:00:00 2001 From: Ethan Kromhout Date: Wed, 6 Jan 2021 14:38:39 -0500 Subject: [PATCH 8/8] 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 +