From d2681c27a0bfd5e885f4dec483f446d3cee376fd Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sat, 8 Apr 2023 00:35:49 +0200 Subject: [PATCH] Rename Riot to Element globally --- roles/docker/defaults/main.yml | 6 +-- .../configs/{riot => element}/config.json | 0 .../configs/{riot => element}/riot.im.conf | 0 .../matrix/{vhost-riot => vhost-element} | 0 .../{matrix_riot.yml => matrix_element.yml} | 38 +++++++++---------- 5 files changed, 22 insertions(+), 22 deletions(-) rename roles/docker/files/configs/{riot => element}/config.json (100%) rename roles/docker/files/configs/{riot => element}/riot.im.conf (100%) rename roles/docker/files/configs/matrix/{vhost-riot => vhost-element} (100%) rename roles/docker/tasks/services/{matrix_riot.yml => matrix_element.yml} (73%) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index c0a185a8..ac2c9b4d 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -92,18 +92,18 @@ services: allowed_sender_domain: true matrix: - file: matrix_riot.yml + file: matrix_element.yml domain: "matrix.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/matrix" version: v1.80.0 postgres_version: 15-alpine allowed_sender_domain: true - riot: + element: domains: - "riot.{{ base_domain }}" - "element.{{ base_domain }}" - volume_folder: "{{ volume_root_folder }}/riot" + volume_folder: "{{ volume_root_folder }}/element" version: v1.11.28 privatebin: diff --git a/roles/docker/files/configs/riot/config.json b/roles/docker/files/configs/element/config.json similarity index 100% rename from roles/docker/files/configs/riot/config.json rename to roles/docker/files/configs/element/config.json diff --git a/roles/docker/files/configs/riot/riot.im.conf b/roles/docker/files/configs/element/riot.im.conf similarity index 100% rename from roles/docker/files/configs/riot/riot.im.conf rename to roles/docker/files/configs/element/riot.im.conf diff --git a/roles/docker/files/configs/matrix/vhost-riot b/roles/docker/files/configs/matrix/vhost-element similarity index 100% rename from roles/docker/files/configs/matrix/vhost-riot rename to roles/docker/files/configs/matrix/vhost-element diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_element.yml similarity index 73% rename from roles/docker/tasks/services/matrix_riot.yml rename to roles/docker/tasks/services/matrix_element.yml index d24c4d8e..62df3f3e 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_element.yml @@ -1,6 +1,6 @@ # vim: ft=yaml.ansible --- -- name: create matrix volume folders +- name: Create Matrix volume folders file: name: "{{ services.matrix.volume_folder }}/{{ volume }}" state: directory @@ -13,42 +13,42 @@ loop_control: loop_var: volume -- name: create matrix DB folder +- name: Create Matrix DB folder file: name: "{{ services.matrix.volume_folder }}/db" state: "directory" -- name: create riot volume folders +- name: Create Element volume folders file: - name: "{{ services.riot.volume_folder }}/{{ volume }}" + name: "{{ services.element.volume_folder }}/{{ volume }}" state: directory loop: - "data" loop_control: loop_var: volume -- name: upload riot config.json +- name: Upload Element config.json template: - src: files/configs/riot/config.json - dest: "{{ services.riot.volume_folder }}/data/config.json" + src: files/configs/element/config.json + dest: "{{ services.element.volume_folder }}/data/config.json" -- name: upload riot.im.conf +- name: Upload Element riot.im.conf template: - src: files/configs/riot/riot.im.conf - dest: "{{ services.riot.volume_folder }}/data/riot.im.conf" + src: files/configs/element/riot.im.conf + dest: "{{ services.element.volume_folder }}/data/riot.im.conf" - name: upload vhost config for matrix domain template: src: files/configs/matrix/vhost-matrix dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.matrix.domain }}" -- name: upload vhost config for riot domain +- name: Upload vhost config for Element domain template: - src: files/configs/matrix/vhost-riot + src: files/configs/matrix/vhost-element dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ item }}" - loop: "{{ services.riot.domains }}" + loop: "{{ services.element.domains }}" -- name: upload homeserver.yaml +- name: Upload homeserver.yaml template: src: "files/configs/matrix/homeserver.yaml.j2" dest: "{{ services.matrix.volume_folder }}/data/homeserver.yaml" @@ -58,7 +58,7 @@ src: "files/configs/matrix/matrix.data.coop.log.config" dest: "{{ services.matrix.volume_folder }}/data/matrix.data.coop.log.config" -- name: set up matrix and riot +- name: Set up Matrix and Element docker_compose: project_name: matrix pull: true @@ -94,7 +94,7 @@ LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" element: - image: "avhost/docker-matrix-riot:{{ services.riot.version }}" + image: "avhost/docker-matrix-element:{{ services.element.version }}" restart: unless-stopped networks: - matrix @@ -102,11 +102,11 @@ expose: - 8080 volumes: - - "{{ services.riot.volume_folder }}/data:/data" + - "{{ services.element.volume_folder }}/data:/data" environment: - VIRTUAL_HOST: "{{ services.riot.domains | join(',') }}" + VIRTUAL_HOST: "{{ services.element.domains | join(',') }}" VIRTUAL_PORT: "8080" - LETSENCRYPT_HOST: "{{ services.riot.domains | join(',') }}" + LETSENCRYPT_HOST: "{{ services.element.domains | join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" networks: