diff --git a/group_vars/reverseproxy.yml b/group_vars/reverseproxy.yml index f68ebc88..93db0e93 100644 --- a/group_vars/reverseproxy.yml +++ b/group_vars/reverseproxy.yml @@ -61,7 +61,6 @@ glob_reverseproxy: - {from: intranet.crans.org, to: 172.16.10.156} - {from: linx.crans.org, to: "172.16.10.119:8080"} - {from: lists.crans.org, to: 172.16.10.110} - - {from: matrix.crans.org, to: "172.16.10.141:8008"} - {from: mirrors.crans.org, to: 172.16.10.104} - {from: nextcloud.crans.org, to: 172.16.10.137} - {from: onlyoffice.crans.org, to: 172.16.10.148} @@ -83,8 +82,6 @@ glob_reverseproxy: - {from: perso.crans.org, to: 172.16.10.31} redirect_sites: - - {from: crans.org, to: www.crans.org} - # Aliases or legacy support - {from: adopteunpingouin.crans.org, to: install-party.crans.org} - {from: clubs.crans.org, to: perso.crans.org} @@ -103,4 +100,5 @@ glob_reverseproxy: static_sites: - autoconfig.crans.org - install-party.crans.org + - crans.org - www.crans.org diff --git a/roles/matrix-synapse/handlers/main.yml b/roles/matrix-synapse/handlers/main.yml deleted file mode 100644 index aab51dae..00000000 --- a/roles/matrix-synapse/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Restart matrix-synapse - service: - name: matrix-synapse - state: restarted diff --git a/roles/matrix-synapse/tasks/main.yml b/roles/matrix-synapse/tasks/main.yml deleted file mode 100644 index 6ba08617..00000000 --- a/roles/matrix-synapse/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- name: Configure Debian backports repository - template: - src: apt/sources.list.d/backports.list.j2 - dest: /etc/apt/sources.list.d/backports.list - -- name: Install matrix-synapse - apt: - update_cache: true - default_release: "{{ ansible_lsb.codename }}-backports" - name: matrix-synapse - register: apt_result - retries: 3 - until: apt_result is succeeded - -- name: Configure matrix-synapse - template: - src: matrix-synapse/conf.d/{{ item }}.j2 - dest: /etc/matrix-synapse/conf.d/{{ item }} - mode: 0640 - owner: matrix-synapse - group: nogroup - loop: - - app_service_config_files.yaml - - database.yaml - - listeners.yaml - - report_stats.yaml - - server_name.yaml - notify: Restart matrix-synapse diff --git a/roles/matrix-synapse/templates/apt/sources.list.d/backports.list.j2 b/roles/matrix-synapse/templates/apt/sources.list.d/backports.list.j2 deleted file mode 100644 index 6326b3e4..00000000 --- a/roles/matrix-synapse/templates/apt/sources.list.d/backports.list.j2 +++ /dev/null @@ -1 +0,0 @@ -deb {{ debian_mirror }} {{ ansible_lsb.codename }}-backports main contrib non-free diff --git a/roles/matrix-synapse/templates/matrix-synapse/conf.d/app_service_config_files.yaml.j2 b/roles/matrix-synapse/templates/matrix-synapse/conf.d/app_service_config_files.yaml.j2 deleted file mode 100644 index 7ed59eac..00000000 --- a/roles/matrix-synapse/templates/matrix-synapse/conf.d/app_service_config_files.yaml.j2 +++ /dev/null @@ -1 +0,0 @@ -app_service_config_files: ["/var/local/matrix-appservice-irc/registration.yaml"] diff --git a/roles/matrix-synapse/templates/matrix-synapse/conf.d/database.yaml.j2 b/roles/matrix-synapse/templates/matrix-synapse/conf.d/database.yaml.j2 deleted file mode 100644 index ceaf706e..00000000 --- a/roles/matrix-synapse/templates/matrix-synapse/conf.d/database.yaml.j2 +++ /dev/null @@ -1,9 +0,0 @@ -database: - name: "psycopg2" - args: - user: "{{ matrix_synapse.database.user }}" - password: "{{ matrix_synapse.database.password }}" - database: "{{ matrix_synapse.database.name }}" - host: "{{ matrix_synapse.database.host }}" - cp_min: 5 - cp_max: 10 diff --git a/roles/matrix-synapse/templates/matrix-synapse/conf.d/listeners.yaml.j2 b/roles/matrix-synapse/templates/matrix-synapse/conf.d/listeners.yaml.j2 deleted file mode 100644 index a37ad8f6..00000000 --- a/roles/matrix-synapse/templates/matrix-synapse/conf.d/listeners.yaml.j2 +++ /dev/null @@ -1,14 +0,0 @@ -listeners: - - port: 8008 - tls: false - bind_addresses: - - '::' - - '0.0.0.0' - type: http - x_forwarded: true - resources: - - names: [client] - compress: true - - names: [federation] - compress: false - diff --git a/roles/matrix-synapse/templates/matrix-synapse/conf.d/report_stats.yaml.j2 b/roles/matrix-synapse/templates/matrix-synapse/conf.d/report_stats.yaml.j2 deleted file mode 100644 index 47d71ee0..00000000 --- a/roles/matrix-synapse/templates/matrix-synapse/conf.d/report_stats.yaml.j2 +++ /dev/null @@ -1,2 +0,0 @@ -report_stats: false - diff --git a/roles/matrix-synapse/templates/matrix-synapse/conf.d/server_name.yaml.j2 b/roles/matrix-synapse/templates/matrix-synapse/conf.d/server_name.yaml.j2 deleted file mode 100644 index 0da924aa..00000000 --- a/roles/matrix-synapse/templates/matrix-synapse/conf.d/server_name.yaml.j2 +++ /dev/null @@ -1,2 +0,0 @@ -server_name: crans.org -