From d284cc2005f830e517a1aedffa972af98812fd03 Mon Sep 17 00:00:00 2001 From: Viyurz Date: Sun, 13 Oct 2024 10:14:19 +0200 Subject: [PATCH] Remove Element --- env.yml | 2 -- projects/homepage/services.toml | 7 ------- pyenv.yml | 1 - roles/element/tasks/main.yml | 9 --------- roles/element/tasks/setup.yml | 18 ------------------ roles/element/tasks/update.yml | 18 ------------------ roles/element/templates/config.json | 3 --- roles/element/templates/docker-compose.yaml | 9 --------- .../nginx/templates/sites-enabled/element.conf | 16 ---------------- roles/synapse/templates/homeserver.yaml | 2 +- 10 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 roles/element/tasks/main.yml delete mode 100644 roles/element/tasks/setup.yml delete mode 100644 roles/element/tasks/update.yml delete mode 100644 roles/element/templates/config.json delete mode 100644 roles/element/templates/docker-compose.yaml delete mode 100644 roles/nginx/templates/sites-enabled/element.conf diff --git a/env.yml b/env.yml index 0e42f48..c511f92 100644 --- a/env.yml +++ b/env.yml @@ -47,7 +47,6 @@ cifs_mounts: projects: - coturn - diun - - element - etebase - fireshare - hedgedoc @@ -90,7 +89,6 @@ ports: coturn_tls_listening: 5349 coturn_relay_min: 49152 coturn_relay_max: 49172 - element: 8084 etebase: 3735 fireshare: 8085 hedgedoc: 8086 diff --git a/projects/homepage/services.toml b/projects/homepage/services.toml index 9929ecc..1b512c4 100644 --- a/projects/homepage/services.toml +++ b/projects/homepage/services.toml @@ -1,10 +1,3 @@ -[[services]] -name = "Element" -description = "Web client of Element, an instant messaging client implementing the Matrix protocol." -domain = "element.viyurz.fr" -language = "TypeScript" -repository_url = "https://github.com/element-hq/element-web" - [[services]] name = "EteBase" description = "Server for EteSync, an end-to-end encrypted contacts, calendars, tasks and notes provider." diff --git a/pyenv.yml b/pyenv.yml index f646049..ea1d7af 100644 --- a/pyenv.yml +++ b/pyenv.yml @@ -63,7 +63,6 @@ ports: coturn_tls_listening: 5349 coturn_relay_min: 49152 coturn_relay_max: 49172 - element: 8084 etebase: 3735 fireshare: 8085 hedgedoc: 8086 diff --git a/roles/element/tasks/main.yml b/roles/element/tasks/main.yml deleted file mode 100644 index 2b65be3..0000000 --- a/roles/element/tasks/main.yml +++ /dev/null @@ -1,9 +0,0 @@ -- name: Include setup tasks - include_tasks: - file: setup.yml - when: run_setup | default(false) | bool - -- name: Include update tasks - include_tasks: - file: update.yml - when: run_update | default(false) | bool diff --git a/roles/element/tasks/setup.yml b/roles/element/tasks/setup.yml deleted file mode 100644 index cdf695f..0000000 --- a/roles/element/tasks/setup.yml +++ /dev/null @@ -1,18 +0,0 @@ -- name: "(Re)Create {{ project_dir }} project directory" - file: - path: "{{ project_dir }}" - state: "{{ item }}" - loop: - - absent - - directory - -- name: Template docker-compose.yaml & config.json to project directory - template: - src: "{{ item }}" - dest: "{{ project_dir }}/{{ item }}" - owner: "{{ host_uid }}" - group: "{{ host_uid }}" - mode: '644' - loop: - - docker-compose.yaml - - config.json diff --git a/roles/element/tasks/update.yml b/roles/element/tasks/update.yml deleted file mode 100644 index 24a3012..0000000 --- a/roles/element/tasks/update.yml +++ /dev/null @@ -1,18 +0,0 @@ -- name: Pull project services - community.docker.docker_compose_v2: - project_src: "{{ project_dir }}" - recreate: never - pull: always - debug: true - when: docker_pull_images | bool - register: element_docker_compose_pull_result - -- name: Display pulled image(s) name - set_fact: - element_pulled_images: "{{ element_pulled_images | default([]) + [item.pulled_image.name] }}" - loop: "{{ element_docker_compose_pull_result['actions'] | default([]) | selectattr('pulled_image', 'defined') }}" - -- name: Create/Restart project services - community.docker.docker_compose_v2: - project_src: "{{ project_dir }}" - state: "{{ run_setup | default(false) | bool | ternary('restarted', 'present') }}" diff --git a/roles/element/templates/config.json b/roles/element/templates/config.json deleted file mode 100644 index 3c9758f..0000000 --- a/roles/element/templates/config.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "default_server_name": "{{ domain }}" -} diff --git a/roles/element/templates/docker-compose.yaml b/roles/element/templates/docker-compose.yaml deleted file mode 100644 index e28d786..0000000 --- a/roles/element/templates/docker-compose.yaml +++ /dev/null @@ -1,9 +0,0 @@ -services: - element: - container_name: element - image: docker.io/vectorim/element-web:latest - restart: always - ports: - - 127.0.0.1:{{ ports['element'] }}:80 - volumes: - - ./config.json:/app/config.json diff --git a/roles/nginx/templates/sites-enabled/element.conf b/roles/nginx/templates/sites-enabled/element.conf deleted file mode 100644 index ebb18d1..0000000 --- a/roles/nginx/templates/sites-enabled/element.conf +++ /dev/null @@ -1,16 +0,0 @@ -server { - listen 443 ssl; - listen [::]:443 ssl; - - server_name element.{{ domain }}; - - location / { - proxy_pass http://127.0.0.1:{{ ports['element'] }}; - - include /etc/nginx/snippets/ssl-headers.conf; - add_header X-Frame-Options SAMEORIGIN; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header Content-Security-Policy "frame-ancestors 'none'"; - } -} diff --git a/roles/synapse/templates/homeserver.yaml b/roles/synapse/templates/homeserver.yaml index bb880e9..5d95c9e 100644 --- a/roles/synapse/templates/homeserver.yaml +++ b/roles/synapse/templates/homeserver.yaml @@ -22,7 +22,7 @@ email: smtp_pass: '{{ synapse_secrets["smtp_pass"] }}' force_tls: true notif_from: "Matrix " - invite_client_location: "https://element.{{ domain }}" + #invite_client_location: "https://element.{{ domain }}" # Homeserver blocking