From 7d01383a8f28bc9f5fee81515137a444406584fb Mon Sep 17 00:00:00 2001
From: loooph <loooph@gmx.de>
Date: Sun, 7 Nov 2021 19:14:03 +0100
Subject: [PATCH] remove unused parts

---
 roles/matrix-common-after/tasks/awx_post.yml | 64 --------------------
 roles/matrix-common-after/tasks/main.yml     |  8 +--
 roles/matrix-coturn/tasks/init.yml           |  6 --
 roles/matrix-mailer/tasks/init.yml           |  6 --
 4 files changed, 2 insertions(+), 82 deletions(-)
 delete mode 100644 roles/matrix-common-after/tasks/awx_post.yml

diff --git a/roles/matrix-common-after/tasks/awx_post.yml b/roles/matrix-common-after/tasks/awx_post.yml
deleted file mode 100644
index 8175267d..00000000
--- a/roles/matrix-common-after/tasks/awx_post.yml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-
-- name: Create user account @janitor
-  command: |
-    /usr/local/bin/matrix-synapse-register-user janitor {{ awx_janitor_user_password | quote }} 1
-  register: cmd
-  when: not awx_janitor_user_created|bool
-  no_log: True
-    
-- name: Update AWX janitor 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:
-    'awx_janitor_user_created': 'true'
-  when: not awx_janitor_user_created|bool
-
-- name: Create user account @dimension
-  command: |
-    /usr/local/bin/matrix-synapse-register-user dimension {{ awx_dimension_user_password | quote }} 0
-  register: cmd
-  when: not 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:
-    'awx_dimension_user_created': 'true'
-  when: not awx_dimension_user_created|bool
-
-- name: Create user account @mjolnir
-  command: |
-    /usr/local/bin/matrix-synapse-register-user mjolnir {{ awx_mjolnir_user_password | quote }} 0
-  register: cmd
-  when: not awx_mjolnir_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:
-    'awx_mjolnir_user_created': 'true'
-  when: not awx_mjolnir_user_created|bool
-
-- name: Ensure /chroot/website location has correct permissions
-  file:
-    path: /chroot/website
-    state: directory
-    owner: matrix
-    group: matrix
-    mode: '0770'
-  when: awx_customise_base_domain_website is defined
diff --git a/roles/matrix-common-after/tasks/main.yml b/roles/matrix-common-after/tasks/main.yml
index b4503ae1..af9c8cb0 100644
--- a/roles/matrix-common-after/tasks/main.yml
+++ b/roles/matrix-common-after/tasks/main.yml
@@ -12,14 +12,10 @@
 - import_tasks: "{{ role_path }}/tasks/dump_runtime_results.yml"
   tags:
     - always
-    
-- import_tasks: "{{ role_path }}/tasks/awx_post.yml"
-  when: run_setup|bool and matrix_awx_enabled|bool
-  tags:
-    - always
+
 
 - import_tasks: "{{ role_path }}/tasks/run_docker_prune.yml"
   tags:
     - run-docker-prune
-    
+
 
diff --git a/roles/matrix-coturn/tasks/init.yml b/roles/matrix-coturn/tasks/init.yml
index a7d8a343..b03237b6 100644
--- a/roles/matrix-coturn/tasks/init.yml
+++ b/roles/matrix-coturn/tasks/init.yml
@@ -1,9 +1,3 @@
-# See https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1070
-# and https://github.com/spantaleev/matrix-docker-ansible-deploy/commit/1ab507349c752042d26def3e95884f6df8886b74#commitcomment-51108407
-- name: Fail if trying to self-build on Ansible < 2.8
-  fail:
-    msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_coturn_container_image_self_build and matrix_coturn_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-coturn.service'] }}"
diff --git a/roles/matrix-mailer/tasks/init.yml b/roles/matrix-mailer/tasks/init.yml
index d07380f0..2b72b9bf 100644
--- a/roles/matrix-mailer/tasks/init.yml
+++ b/roles/matrix-mailer/tasks/init.yml
@@ -1,9 +1,3 @@
-# See https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1070
-# and https://github.com/spantaleev/matrix-docker-ansible-deploy/commit/1ab507349c752042d26def3e95884f6df8886b74#commitcomment-51108407
-- name: Fail if trying to self-build on Ansible < 2.8
-  fail:
-    msg: "To self-build the Element image, you should use Ansible 2.8 or higher. See docs/ansible.md"
-  when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_mailer_container_image_self_build and matrix_mailer_enabled"
 
 - set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mailer.service'] }}"