summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2023-11-06 21:16:50 +0000
committerJohannes Löthberg <johannes@kyriasis.com>2023-11-06 21:16:50 +0000
commit3b6425a753565dfae584a0a78e602386cdf90539 (patch)
tree645133936c37866423aa6251c7c0d33c138a75f9
parent502a1ae13ed13b3f3e6155a7867423c8f0135d7f (diff)
downloadpillar-3b6425a753565dfae584a0a78e602386cdf90539.tar.xz
Drop matrix
-rw-r--r--nginx/gallery_remmy_io.sls1
-rw-r--r--nginx/kyriasis_com.sls8
-rw-r--r--nginx/matrix_kyriasis_com.sls79
-rw-r--r--top.sls1
4 files changed, 0 insertions, 89 deletions
diff --git a/nginx/gallery_remmy_io.sls b/nginx/gallery_remmy_io.sls
index 4e0ae81..72b5202 100644
--- a/nginx/gallery_remmy_io.sls
+++ b/nginx/gallery_remmy_io.sls
@@ -15,7 +15,6 @@ nginx:
- location /:
- return: '301 https://$server_name$request_uri'
-
- server:
- server_name: gallery.remmy.io
- listen: 443 ssl http2
diff --git a/nginx/kyriasis_com.sls b/nginx/kyriasis_com.sls
index afe2f9b..51a7658 100644
--- a/nginx/kyriasis_com.sls
+++ b/nginx/kyriasis_com.sls
@@ -52,12 +52,4 @@ nginx:
- location /.well-known:
- root: /srv/http/
- - location /.well-known/matrix/client:
- - proxy_pass: https://matrix.kyriasis.com:8448
- - proxy_buffering: "off"
- - proxy_set_header: X-Forwarded-For $remote_addr
- - proxy_set_header: Host $host
- - add_header: "'Access-Control-Allow-Origin' '*'"
- - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'"
-
# vim: ft=yaml et:
diff --git a/nginx/matrix_kyriasis_com.sls b/nginx/matrix_kyriasis_com.sls
deleted file mode 100644
index f0ddbec..0000000
--- a/nginx/matrix_kyriasis_com.sls
+++ /dev/null
@@ -1,79 +0,0 @@
-nginx:
- servers:
- managed:
- matrix.kyriasis.com:
- enabled: True
- config:
- - upstream matrix_backend:
- - server: 127.0.0.1:8449
-
-
- - server:
- - server_name: matrix.kyriasis.com
- - listen: 80
- - listen: '[::]:80'
-
- - location /.well-known/acme-challenge:
- - root: /srv/http/
-
- - location /:
- - return: '301 https://$server_name$request_uri'
-
-
- - server:
- - server_name: matrix.kyriasis.com
- - listen: 443 ssl http2 default_server
- - listen: '[::]:443 ssl http2 default_server'
-
- - ssl_certificate: /etc/letsencrypt/live/matrix.kyriasis.com/fullchain.pem
- - ssl_certificate_key: /etc/letsencrypt/live/matrix.kyriasis.com/privkey.pem
- - ssl_dhparam: /etc/nginx/dhparam.pem
-
- - ssl_stapling: 'on'
- - ssl_stapling_verify: 'on'
- - ssl_trusted_certificate: /etc/letsencrypt/live/matrix.kyriasis.com/fullchain.pem
-
- # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security
- - add_header: 'Strict-Transport-Security "max-age=31536000"'
-
- # Tell browsers to not try to auto-detect the Content-Type.
- - add_header: X-Content-Type-Options nosniff
-
- # Enable the Cross-site scripting filter in most recent browsers.
- # Normally enabled by default, but enable it anyway if user has disabled it.
- - add_header: 'X-XSS-Protection "1; mode=block"'
-
- # http://www.gnuterrypratchett.com/
- - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"'
-
- - client_max_body_size: 128m
-
- - error_log: /var/log/nginx/matrix.error.log
-
- - location /:
- - return: 301 https://riot.kyriasis.com
-
- - location /_matrix:
- - proxy_pass: https://matrix_backend
- - proxy_buffering: "off"
- - proxy_set_header: X-Forwarded-For $remote_addr
- - proxy_set_header: Host $host
-
- - location /_synapse/:
- - proxy_pass: https://matrix_backend
- - proxy_buffering: "off"
- - proxy_set_header: X-Forwarded-For $remote_addr
- - proxy_set_header: Host $host
-
- - location /.well-known/acme-challenge:
- - root: /srv/http/
-
- - location /.well-known/matrix/client:
- - proxy_pass: https://matrix_backend
- - proxy_buffering: "off"
- - proxy_set_header: X-Forwarded-For $remote_addr
- - proxy_set_header: Host $host
- - add_header: "'Access-Control-Allow-Origin' '*'"
- - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'"
-
-# vim: ft=yaml et:
diff --git a/top.sls b/top.sls
index ee81415..b4bebad 100644
--- a/top.sls
+++ b/top.sls
@@ -5,7 +5,6 @@ base:
- nginx.theos_kyriasis_com
- nginx.xan_kyriasis_com
- nginx.git_kyriasis_com
- - nginx.matrix_kyriasis_com
- nginx.riot_kyriasis_com
- nginx.miniflux_kyriasis_com
- nginx.grafana_kyriasis_com