From 4e6f6e179b091102db847402f06d6fb5a8ab6c2a Mon Sep 17 00:00:00 2001
From: Michael-GMH <gomatrixhosting@tutanota.com>
Date: Mon, 10 May 2021 18:50:10 +0800
Subject: [PATCH 1/5] GMH 0.4.6 update
---
docs/configuring-awx-system.md | 4 +-
roles/matrix-awx/tasks/main.yml | 9 +
.../tasks/purge_database_build_list.yml | 10 +
.../tasks/purge_database_events.yml | 13 +
.../matrix-awx/tasks/purge_database_main.yml | 234 ++++++++++++++++++
.../tasks/purge_database_no_local.yml | 13 +
.../matrix-awx/tasks/purge_database_users.yml | 13 +
roles/matrix-awx/tasks/purge_media_remote.yml | 2 +-
roles/matrix-common-after/tasks/awx_post.yml | 18 ++
.../rust-synapse-compress-state/main.yml | 2 +-
10 files changed, 314 insertions(+), 4 deletions(-)
create mode 100644 roles/matrix-awx/tasks/purge_database_build_list.yml
create mode 100644 roles/matrix-awx/tasks/purge_database_events.yml
create mode 100644 roles/matrix-awx/tasks/purge_database_main.yml
create mode 100644 roles/matrix-awx/tasks/purge_database_no_local.yml
create mode 100644 roles/matrix-awx/tasks/purge_database_users.yml
diff --git a/docs/configuring-awx-system.md b/docs/configuring-awx-system.md
index 3db40efa9..a93980d56 100644
--- a/docs/configuring-awx-system.md
+++ b/docs/configuring-awx-system.md
@@ -32,9 +32,9 @@ Updates to this section are trailed here:
## Does I need an AWX setup to use this? How do I configure it?
-Yes, you'll need to configure an AWX instance, the [Create AWX System](https://gitlab.com/GoMatrixHosting/create-awx-system) repository makes it easy to do. Just follow the steps listed in '/docs/Installation.md' of that repository.
+Yes, you'll need to configure an AWX instance, the [Create AWX System](https://gitlab.com/GoMatrixHosting/create-awx-system) repository makes it easy to do. Just follow the steps listed in ['/docs/Installation.md' of that repository](https://gitlab.com/GoMatrixHosting/create-awx-system/-/blob/master/docs/Installation.md).
-For simpler installation steps you can use to get started with this system, check out our minimal installation guide at '/doc/Installation_Minimal.md'.
+For simpler installation steps you can use to get started with this system, check out our [minimal installation guide at '/doc/Installation_Minimal.md of that repository'](https://gitlab.com/GoMatrixHosting/create-awx-system/-/blob/master/docs/Installation_Minimal.md).
## Does I need a front-end WordPress site? And a DigitalOcean account?
diff --git a/roles/matrix-awx/tasks/main.yml b/roles/matrix-awx/tasks/main.yml
index 58546d5bd..abfef97cb 100755
--- a/roles/matrix-awx/tasks/main.yml
+++ b/roles/matrix-awx/tasks/main.yml
@@ -44,6 +44,15 @@
tags:
- purge-media
+# Purge Synapse database if called
+- include_tasks:
+ file: "purge_database_main.yml"
+ apply:
+ tags: purge-database
+ when: run_setup|bool and matrix_awx_enabled|bool
+ tags:
+ - purge-database
+
# Import configs, media repo from /chroot/backup import
- include_tasks:
file: "import_awx.yml"
diff --git a/roles/matrix-awx/tasks/purge_database_build_list.yml b/roles/matrix-awx/tasks/purge_database_build_list.yml
new file mode 100644
index 000000000..1ea05b7f5
--- /dev/null
+++ b/roles/matrix-awx/tasks/purge_database_build_list.yml
@@ -0,0 +1,10 @@
+
+- name: Collect entire room list into stdout
+ shell: |
+ curl -X GET --header "Authorization: Bearer {{ janitors_token.stdout[1:-1] }}" '{{ synapse_container_ip.stdout }}:8008/_synapse/admin/v1/rooms?from={{ item }}'
+ register: rooms_output
+
+- name: Print stdout to file
+ delegate_to: 127.0.0.1
+ shell: |
+ echo '{{ rooms_output.stdout }}' >> /tmp/{{ subscription_id }}_room_list_complete.json
diff --git a/roles/matrix-awx/tasks/purge_database_events.yml b/roles/matrix-awx/tasks/purge_database_events.yml
new file mode 100644
index 000000000..9e2ef9c2c
--- /dev/null
+++ b/roles/matrix-awx/tasks/purge_database_events.yml
@@ -0,0 +1,13 @@
+
+- name: Purge all rooms with more then N events
+ shell: |
+ curl --header "Authorization: Bearer {{ janitors_token.stdout[1:-1] }}" -X POST -H "Content-Type: application/json" -d '{ "delete_local_events": false, "purge_up_to_ts": {{ purge_epoche_time.stdout }}000 }' "{{ synapse_container_ip.stdout }}:8008/_synapse/admin/v1/purge_history/{{ item[1:-1] }}"
+ register: purge_command
+
+- name: Print output of purge command
+ debug:
+ msg: "{{ purge_command.stdout }}"
+
+- name: Pause for 5 seconds to let Synapse breathe
+ pause:
+ seconds: 5
diff --git a/roles/matrix-awx/tasks/purge_database_main.yml b/roles/matrix-awx/tasks/purge_database_main.yml
new file mode 100644
index 000000000..ccd46c81a
--- /dev/null
+++ b/roles/matrix-awx/tasks/purge_database_main.yml
@@ -0,0 +1,234 @@
+
+- name: Ensure dateutils and curl is installed in AWX
+ delegate_to: 127.0.0.1
+ yum:
+ name: dateutils
+ state: latest
+
+- name: Ensure dateutils, curl and jq intalled on target machine
+ apt:
+ pkg:
+ - curl
+ - jq
+ state: present
+
+- name: Include vars in matrix_vars.yml
+ include_vars:
+ file: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml'
+ no_log: True
+
+- name: Collect size of Synapse database
+ shell: du -sh /matrix/postgres/data
+ register: db_size_before_stat
+ no_log: True
+
+- name: Print before size of Synapse database
+ debug:
+ msg: "{{ db_size_before_stat.stdout.split('\n') }}"
+ when: db_size_before_stat is defined
+
+- name: Collect the internal IP of the matrix-synapse container
+ shell: "/usr/bin/docker inspect --format '{''{range.NetworkSettings.Networks}''}{''{.IPAddress}''}{''{end}''}' matrix-synapse"
+ register: synapse_container_ip
+
+- name: Collect access token for janitor user
+ shell: |
+ curl -X POST -d '{"type":"m.login.password", "user":"janitor", "password":"{{ matrix_awx_janitor_user_password }}"}' "{{ synapse_container_ip.stdout }}:8008/_matrix/client/r0/login" | jq '.access_token'
+ register: janitors_token
+ no_log: True
+
+- name: Collect total number of rooms
+ shell: |
+ curl -X GET --header "Authorization: Bearer {{ janitors_token.stdout[1:-1] }}" '{{ synapse_container_ip.stdout }}:8008/_synapse/admin/v1/rooms' | jq '.total_rooms'
+ when: purge_rooms|bool
+ register: rooms_total
+
+- name: Print total number of rooms
+ debug:
+ msg: '{{ rooms_total.stdout }}'
+ when: purge_rooms|bool
+
+- name: Calculate every 100 values for total number of rooms
+ delegate_to: 127.0.0.1
+ shell: |
+ seq 0 100 {{ rooms_total.stdout }}
+ when: purge_rooms|bool
+ register: every_100_rooms
+
+- name: Ensure room_list_complete.json file exists
+ delegate_to: 127.0.0.1
+ file:
+ path: /tmp/{{ subscription_id }}_room_list_complete.json
+ state: touch
+ when: purge_rooms|bool
+
+- name: Build file with total room list
+ include_tasks: purge_database_build_list.yml
+ loop: "{{ every_100_rooms.stdout_lines | flatten(levels=1) }}"
+ when: purge_rooms|bool
+
+- name: Generate list of rooms with no local users
+ delegate_to: 127.0.0.1
+ shell: |
+ jq 'try .rooms[] | select(.joined_local_members == 0) | .room_id' < /tmp/{{ subscription_id }}_room_list_complete.json > /tmp/{{ subscription_id }}_room_list_no_local_users.txt
+ when: purge_rooms|bool
+
+- name: Count number of rooms with no local users
+ delegate_to: 127.0.0.1
+ shell: |
+ wc -l /tmp/{{ subscription_id }}_room_list_no_local_users.txt | awk '{ print $1 }'
+ register: rooms_no_local_total
+ when: purge_rooms|bool
+
+- name: Setting host fact room_list_no_local_users
+ set_fact:
+ room_list_no_local_users: "{{ lookup('file', '/tmp/{{ subscription_id }}_room_list_no_local_users.txt') }}"
+ no_log: True
+ when: purge_rooms|bool
+
+- name: Purge all rooms with no local users
+ include_tasks: purge_database_no_local.yml
+ loop: "{{ room_list_no_local_users.splitlines() | flatten(levels=1) }}"
+ when: purge_rooms|bool
+
+- name: Collect epoche time from date
+ delegate_to: 127.0.0.1
+ shell: |
+ date -d '{{ purge_date }}' +"%s"
+ when: purge_rooms|bool
+ register: purge_epoche_time
+
+- name: Generate list of rooms with more then N users
+ delegate_to: 127.0.0.1
+ shell: |
+ jq 'try .rooms[] | select(.joined_members > {{ purge_metric_value }}) | .room_id' < /tmp/{{ subscription_id }}_room_list_complete.json > /tmp/{{ subscription_id }}_room_list_joined_members.txt
+ when: (purge_metric.find("Number of users") != -1) and (purge_rooms|bool)
+
+- name: Count number of rooms with more then N users
+ delegate_to: 127.0.0.1
+ shell: |
+ wc -l /tmp/{{ subscription_id }}_room_list_joined_members.txt | awk '{ print $1 }'
+ register: rooms_join_members_total
+ when: (purge_metric.find("Number of users") != -1) and (purge_rooms|bool)
+
+- name: Setting host fact room_list_joined_members
+ delegate_to: 127.0.0.1
+ set_fact:
+ room_list_joined_members: "{{ lookup('file', '/tmp/{{ subscription_id }}_room_list_joined_members.txt') }}"
+ when: (purge_metric.find("Number of users") != -1) and (purge_rooms|bool)
+ no_log: True
+
+- name: Purge all rooms with more then N users
+ include_tasks: purge_database_users.yml
+ loop: "{{ room_list_joined_members.splitlines() | flatten(levels=1) }}"
+ when: (purge_metric.find("Number of users") != -1) and (purge_rooms|bool)
+
+- name: Generate list of rooms with more then N events
+ delegate_to: 127.0.0.1
+ shell: |
+ jq 'try .rooms[] | select(.state_events > {{ purge_metric_value }}) | .room_id' < /tmp/{{ subscription_id }}_room_list_complete.json > /tmp/{{ subscription_id }}_room_list_state_events.txt
+ when: (purge_metric.find("Number of events") != -1) and (purge_rooms|bool)
+
+- name: Count number of rooms with more then N users
+ delegate_to: 127.0.0.1
+ shell: |
+ wc -l /tmp/{{ subscription_id }}_room_list_state_events.txt | awk '{ print $1 }'
+ register: rooms_state_events_total
+ when: (purge_metric.find("Number of events") != -1) and (purge_rooms|bool)
+
+- name: Setting host fact room_list_state_events
+ delegate_to: 127.0.0.1
+ set_fact:
+ room_list_state_events: "{{ lookup('file', '/tmp/{{ subscription_id }}_room_list_state_events.txt') }}"
+ when: (purge_metric.find("Number of events") != -1) and (purge_rooms|bool)
+ no_log: True
+
+- name: Purge all rooms with more then N events
+ include_tasks: purge_database_events.yml
+ loop: "{{ room_list_state_events.splitlines() | flatten(levels=1) }}"
+ when: (purge_metric.find("Number of events") != -1) and (purge_rooms|bool)
+
+- name: Collect AWX admin token the hard way!
+ delegate_to: 127.0.0.1
+ shell: |
+ curl -sku {{ tower_username }}:{{ tower_password }} -H "Content-Type: application/json" -X POST -d '{"description":"Tower CLI", "application":null, "scope":"write"}' https://{{ tower_host }}/api/v2/users/1/personal_tokens/ | jq '.token' | sed -r 's/\"//g'
+ register: tower_token
+ no_log: True
+
+- name: Execute rust-synapse-compress-state job template
+ delegate_to: 127.0.0.1
+ awx.awx.tower_job_launch:
+ job_template: "{{ matrix_domain }} - 0 - Deploy/Update a Server"
+ tags: "rust-synapse-compress-state"
+ wait: yes
+ tower_host: "https://{{ tower_host }}"
+ tower_oauthtoken: "{{ tower_token.stdout }}"
+ validate_certs: yes
+ register: job
+
+- name: Stop Synapse service
+ shell: systemctl stop matrix-synapse.service
+
+- name: Re-index Synapse database
+ shell: docker exec -i matrix-postgres psql "host=127.0.0.1 port=5432 dbname=synapse user=synapse password={{ matrix_synapse_connection_password }}" -c 'REINDEX (VERBOSE) DATABASE synapse'
+
+- name: Execute run-postgres-vacuum job template
+ delegate_to: 127.0.0.1
+ awx.awx.tower_job_launch:
+ job_template: "{{ matrix_domain }} - 0 - Deploy/Update a Server"
+ tags: "run-postgres-vacuum,start"
+ wait: yes
+ tower_host: "https://{{ tower_host }}"
+ tower_oauthtoken: "{{ tower_token.stdout }}"
+ validate_certs: yes
+ register: job
+
+- name: Cleanup room_list files
+ delegate_to: 127.0.0.1
+ shell: |
+ rm /tmp/{{ subscription_id }}_room_list*
+ when: purge_rooms|bool
+ ignore_errors: yes
+
+- name: Collect size of Synapse database
+ shell: du -sh /matrix/postgres/data
+ register: db_size_after_stat
+ no_log: True
+
+- name: Print total number of rooms processed
+ debug:
+ msg: '{{ rooms_total.stdout }}'
+ when: purge_rooms|bool
+
+- name: Print the number of rooms purged with no local users
+ debug:
+ msg: '{{ rooms_no_local_total.stdout }}'
+ when: purge_rooms|bool
+
+- name: Print the number of rooms purged with more then N users
+ debug:
+ msg: '{{ rooms_join_members_total.stdout }}'
+ when: (purge_metric.find("Number of users") != -1) and (purge_rooms|bool)
+
+- name: Print the number of rooms purged with more then N events
+ debug:
+ msg: '{{ rooms_state_events_total.stdout }}'
+ when: (purge_metric.find("Number of events") != -1) and (purge_rooms|bool)
+
+- name: Print before purge size of Synapse database
+ debug:
+ msg: "{{ db_size_before_stat.stdout.split('\n') }}"
+ when: db_size_before_stat is defined
+
+- name: Print after purge size of Synapse database
+ debug:
+ msg: "{{ db_size_after_stat.stdout.split('\n') }}"
+ when: db_size_after_stat is defined
+
+- name: Set boolean value to exit playbook
+ set_fact:
+ end_playbook: true
+
+- name: End playbook early if this task is called.
+ meta: end_play
+ when: end_playbook is defined and end_playbook|bool
diff --git a/roles/matrix-awx/tasks/purge_database_no_local.yml b/roles/matrix-awx/tasks/purge_database_no_local.yml
new file mode 100644
index 000000000..d94fd0072
--- /dev/null
+++ b/roles/matrix-awx/tasks/purge_database_no_local.yml
@@ -0,0 +1,13 @@
+
+- name: Purge all rooms with no local users
+ shell: |
+ curl --header "Authorization: Bearer {{ janitors_token.stdout[1:-1] }}" -X POST -H "Content-Type: application/json" -d '{ "room_id": {{ item }} }' '{{ synapse_container_ip.stdout }}:8008/_synapse/admin/v1/purge_room'
+ register: purge_command
+
+- name: Print output of purge command
+ debug:
+ msg: "{{ purge_command.stdout }}"
+
+- name: Pause for 5 seconds to let Synapse breathe
+ pause:
+ seconds: 5
diff --git a/roles/matrix-awx/tasks/purge_database_users.yml b/roles/matrix-awx/tasks/purge_database_users.yml
new file mode 100644
index 000000000..302dffd85
--- /dev/null
+++ b/roles/matrix-awx/tasks/purge_database_users.yml
@@ -0,0 +1,13 @@
+
+- name: Purge all rooms with more then N users
+ shell: |
+ curl --header "Authorization: Bearer {{ janitors_token.stdout[1:-1] }}" -X POST -H "Content-Type: application/json" -d '{ "delete_local_events": false, "purge_up_to_ts": {{ purge_epoche_time.stdout }}000 }' "{{ synapse_container_ip.stdout }}:8008/_synapse/admin/v1/purge_history/{{ item[1:-1] }}"
+ register: purge_command
+
+- name: Print output of purge command
+ debug:
+ msg: "{{ purge_command.stdout }}"
+
+- name: Pause for 5 seconds to let Synapse breathe
+ pause:
+ seconds: 5
diff --git a/roles/matrix-awx/tasks/purge_media_remote.yml b/roles/matrix-awx/tasks/purge_media_remote.yml
index ce0a1c96a..14f9c8d5d 100644
--- a/roles/matrix-awx/tasks/purge_media_remote.yml
+++ b/roles/matrix-awx/tasks/purge_media_remote.yml
@@ -4,7 +4,7 @@
date -d '{{ item }}' +"%s"
register: epoche_time
-- name: Purge local media to specific date
+- name: Purge remote media to specific date
shell: |
curl -X POST --header "Authorization: Bearer {{ janitors_token.stdout[1:-1] }}" '{{ synapse_container_ip.stdout }}:8008/_synapse/admin/v1/purge_media_cache?before_ts={{ epoche_time.stdout }}'
register: purge_command
diff --git a/roles/matrix-common-after/tasks/awx_post.yml b/roles/matrix-common-after/tasks/awx_post.yml
index cf843d24b..08fd54501 100644
--- a/roles/matrix-common-after/tasks/awx_post.yml
+++ b/roles/matrix-common-after/tasks/awx_post.yml
@@ -35,7 +35,25 @@
with_dict:
'matrix_awx_dimension_user_created': 'true'
when: not matrix_awx_dimension_user_created|bool
+
+- name: Create user account @mjolnir-bot
+ command: |
+ /usr/local/bin/matrix-synapse-register-user mjolnir-bot {{ matrix_awx_mjolnir-bot_user_password | quote }} 0
+ register: cmd
+ when: not matrix_awx_dimension_user_created|bool
+ no_log: True
+- name: Update AWX dimension user created variable
+ delegate_to: 127.0.0.1
+ lineinfile:
+ path: '/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml'
+ regexp: "^#? *{{ item.key | regex_escape() }}:"
+ line: "{{ item.key }}: {{ item.value }}"
+ insertafter: 'AWX Settings'
+ with_dict:
+ 'matrix_awx_mjolnir-bot_user_created': 'true'
+ when: not matrix_awx_dimension_user_created|bool
+
- name: Ensure /chroot/website location has correct permissions
file:
path: /chroot/website
diff --git a/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml b/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml
index 4ce02bc4c..eef46cb37 100644
--- a/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml
+++ b/roles/matrix-synapse/tasks/rust-synapse-compress-state/main.yml
@@ -10,7 +10,7 @@
- name: Set matrix_synapse_rust_synapse_compress_state_find_rooms_command_wait_time, if not provided
set_fact:
- matrix_synapse_rust_synapse_compress_state_find_rooms_command_wait_time: 15
+ matrix_synapse_rust_synapse_compress_state_find_rooms_command_wait_time: 180
when: "matrix_synapse_rust_synapse_compress_state_find_rooms_command_wait_time|default('') == ''"
- name: Set matrix_synapse_rust_synapse_compress_state_compress_room_time, if not provided
From f827a3cc463cb51f3a1a0837bd4c0f5b0550bd66 Mon Sep 17 00:00:00 2001
From: Michael-GMH <gomatrixhosting@tutanota.com>
Date: Mon, 10 May 2021 18:54:25 +0800
Subject: [PATCH 2/5] GMH 0.4.6 update 2
---
docs/configuring-awx-system.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/configuring-awx-system.md b/docs/configuring-awx-system.md
index a93980d56..cc90fb98f 100644
--- a/docs/configuring-awx-system.md
+++ b/docs/configuring-awx-system.md
@@ -34,7 +34,7 @@ Updates to this section are trailed here:
Yes, you'll need to configure an AWX instance, the [Create AWX System](https://gitlab.com/GoMatrixHosting/create-awx-system) repository makes it easy to do. Just follow the steps listed in ['/docs/Installation.md' of that repository](https://gitlab.com/GoMatrixHosting/create-awx-system/-/blob/master/docs/Installation.md).
-For simpler installation steps you can use to get started with this system, check out our [minimal installation guide at '/doc/Installation_Minimal.md of that repository'](https://gitlab.com/GoMatrixHosting/create-awx-system/-/blob/master/docs/Installation_Minimal.md).
+For simpler installation steps you can use to get started with this system, check out our minimal installation guide at ['/doc/Installation_Minimal.md of that repository'](https://gitlab.com/GoMatrixHosting/create-awx-system/-/blob/master/docs/Installation_Minimal.md).
## Does I need a front-end WordPress site? And a DigitalOcean account?
From f70102e40c22b187ac884366fc4568a1c2c1254b Mon Sep 17 00:00:00 2001
From: Michael-GMH <gomatrixhosting@tutanota.com>
Date: Tue, 11 May 2021 13:55:13 +0800
Subject: [PATCH 3/5] no dashes in usernames
---
roles/matrix-common-after/tasks/awx_post.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/matrix-common-after/tasks/awx_post.yml b/roles/matrix-common-after/tasks/awx_post.yml
index 08fd54501..921ad1677 100644
--- a/roles/matrix-common-after/tasks/awx_post.yml
+++ b/roles/matrix-common-after/tasks/awx_post.yml
@@ -36,9 +36,9 @@
'matrix_awx_dimension_user_created': 'true'
when: not matrix_awx_dimension_user_created|bool
-- name: Create user account @mjolnir-bot
+- name: Create user account @mjolnir
command: |
- /usr/local/bin/matrix-synapse-register-user mjolnir-bot {{ matrix_awx_mjolnir-bot_user_password | quote }} 0
+ /usr/local/bin/matrix-synapse-register-user mjolnir {{ matrix_awx_mjolnir-bot_user_password | quote }} 0
register: cmd
when: not matrix_awx_dimension_user_created|bool
no_log: True
@@ -51,7 +51,7 @@
line: "{{ item.key }}: {{ item.value }}"
insertafter: 'AWX Settings'
with_dict:
- 'matrix_awx_mjolnir-bot_user_created': 'true'
+ 'matrix_awx_mjolnir_user_created': 'true'
when: not matrix_awx_dimension_user_created|bool
- name: Ensure /chroot/website location has correct permissions
From 0adcef65e6f3f5d72b81a15ec672ee20e544cd2c Mon Sep 17 00:00:00 2001
From: Michael-GMH <gomatrixhosting@tutanota.com>
Date: Tue, 11 May 2021 13:58:42 +0800
Subject: [PATCH 4/5] fix conditional
---
roles/matrix-common-after/tasks/awx_post.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/matrix-common-after/tasks/awx_post.yml b/roles/matrix-common-after/tasks/awx_post.yml
index 921ad1677..16477d1e4 100644
--- a/roles/matrix-common-after/tasks/awx_post.yml
+++ b/roles/matrix-common-after/tasks/awx_post.yml
@@ -40,7 +40,7 @@
command: |
/usr/local/bin/matrix-synapse-register-user mjolnir {{ matrix_awx_mjolnir-bot_user_password | quote }} 0
register: cmd
- when: not matrix_awx_dimension_user_created|bool
+ when: not matrix_awx_mjolnir_user_created|bool
no_log: True
- name: Update AWX dimension user created variable
@@ -52,7 +52,7 @@
insertafter: 'AWX Settings'
with_dict:
'matrix_awx_mjolnir_user_created': 'true'
- when: not matrix_awx_dimension_user_created|bool
+ when: not matrix_awx_mjolnir_user_created|bool
- name: Ensure /chroot/website location has correct permissions
file:
From 2b4bada72a1c322ec74fd506500815c87f5ebb72 Mon Sep 17 00:00:00 2001
From: Michael-GMH <gomatrixhosting@tutanota.com>
Date: Tue, 11 May 2021 14:05:45 +0800
Subject: [PATCH 5/5] fix conditional
---
roles/matrix-common-after/tasks/awx_post.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/matrix-common-after/tasks/awx_post.yml b/roles/matrix-common-after/tasks/awx_post.yml
index 16477d1e4..1e194046f 100644
--- a/roles/matrix-common-after/tasks/awx_post.yml
+++ b/roles/matrix-common-after/tasks/awx_post.yml
@@ -38,7 +38,7 @@
- name: Create user account @mjolnir
command: |
- /usr/local/bin/matrix-synapse-register-user mjolnir {{ matrix_awx_mjolnir-bot_user_password | quote }} 0
+ /usr/local/bin/matrix-synapse-register-user mjolnir {{ matrix_awx_mjolnir_user_password | quote }} 0
register: cmd
when: not matrix_awx_mjolnir_user_created|bool
no_log: True