From 80b3369339996ac82bbbdd528fdccba95a87c308 Mon Sep 17 00:00:00 2001 From: Scott Wallace Date: Fri, 18 Oct 2019 08:40:04 +0100 Subject: [PATCH 1/3] Fix rclone config location --- .ansible/roles/rclone_mount/tasks/main.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ansible/roles/rclone_mount/tasks/main.yaml b/.ansible/roles/rclone_mount/tasks/main.yaml index 67ac8ca..f5aea65 100644 --- a/.ansible/roles/rclone_mount/tasks/main.yaml +++ b/.ansible/roles/rclone_mount/tasks/main.yaml @@ -16,6 +16,7 @@ - "/mnt/GoogleDriveCrypt" - "/mnt/.media.cache" - "/mnt/.overlay.work" + - "/srv/etc/rclone" become: yes - name: "Rclone: Packages" @@ -31,7 +32,7 @@ - config template: src: "templates/rclone.conf.j2" - dest: "/srv/etc/rclone.conf" + dest: "/srv/etc/rclone/rclone.conf" mode: "0600" owner: "media" group: "media" From 3768ea9233b63137dd8cdba89c2550d2efc8fd75 Mon Sep 17 00:00:00 2001 From: Scott Wallace Date: Fri, 18 Oct 2019 08:51:15 +0100 Subject: [PATCH 2/3] Remove all TLS configuration from Matrix --- .../matrix_server/templates/homeserver.yaml.j2 | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.ansible/roles/matrix_server/templates/homeserver.yaml.j2 b/.ansible/roles/matrix_server/templates/homeserver.yaml.j2 index 743c366..a3cbd36 100644 --- a/.ansible/roles/matrix_server/templates/homeserver.yaml.j2 +++ b/.ansible/roles/matrix_server/templates/homeserver.yaml.j2 @@ -1,23 +1,9 @@ -tls_certificate_path: "/etc/letsencrypt/live/home.suborbit.com/fullchain.pem" -tls_private_key_path: "/etc/letsencrypt/live/home.suborbit.com/privkey.pem" -tls_dh_params_path: "/etc/matrix-synapse/dhparam.pem" -no_tls: False +no_tls: True tls_fingerprints: [{ "sha256": "/HCvvvL0fZZb3BsgA8KIegBijVjk4UCbA9od18BLxOE" }] pid_file: /run/matrix-synapse.pid soft_file_limit: 0 use_presence: true listeners: - - port: 8448 - bind_addresses: - - "0.0.0.0" - type: http - tls: true - x_forwarded: false - resources: - - names: [client] # The client-server APIs, both v1 and v2 - compress: true - - names: [federation] # Federation APIs - compress: false - port: 8008 tls: false bind_addresses: ["0.0.0.0"] From 2aca55580aa8e32764016031fb76f44c5a57b03a Mon Sep 17 00:00:00 2001 From: Scott Wallace Date: Fri, 18 Oct 2019 08:53:16 +0100 Subject: [PATCH 3/3] Use the Dockerised versions of everything --- .ansible/roles/haproxy_server/files/haproxy.cfg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.ansible/roles/haproxy_server/files/haproxy.cfg b/.ansible/roles/haproxy_server/files/haproxy.cfg index e67e0c3..cbb00eb 100644 --- a/.ansible/roles/haproxy_server/files/haproxy.cfg +++ b/.ansible/roles/haproxy_server/files/haproxy.cfg @@ -67,24 +67,24 @@ frontend search.lan backend qbittorrent-backend - server jupiter 10.0.9.110:8181 + server jupiter 10.0.9.111:8181 reqrep ^([^\ :]*)\ /bt/(.*) \1\ /\2 backend sonarr-backend - server jupiter 10.0.9.110:8989 + server jupiter 10.0.9.111:8989 backend radarr-backend - server jupiter 10.0.9.110:7878 + server jupiter 10.0.9.111:7878 backend sabnzbd-backend - server jupiter 10.0.9.110:8080 + server jupiter 10.0.9.111:8080 backend jackett-backend - server jupiter 10.0.9.110:9117 + server jupiter 10.0.9.111:9117 reqrep ^([^\ :]*)\ /jackett/(.*) \1\ /\2 backend matrix-backend - server localhost 127.0.0.1:8008 maxconn 64 + server localhost 10.0.9.111:8008 maxconn 64 backend searx-backend server localhost 127.0.0.1:8888