From 9d103da732f98483472ca4298507ef39d49974a9 Mon Sep 17 00:00:00 2001 From: caskd Date: Wed, 7 Aug 2019 17:31:39 +0200 Subject: [PATCH] Drop ZNC support and remove old refferences to port 2096 --- build/HAProxy/haproxy.conf | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/build/HAProxy/haproxy.conf b/build/HAProxy/haproxy.conf index cd36bde..c1042e9 100644 --- a/build/HAProxy/haproxy.conf +++ b/build/HAProxy/haproxy.conf @@ -43,14 +43,13 @@ frontend https acl public_cache res.hdr(content-type) -i -m str text/css -i -m str application/javascript -i -m beg font/ acl private_cache res.hdr(content-type) -i -m beg image/ -i -m beg audio/ -i -m beg video/ -i -m beg text/ -i -m beg application/ - acl yagpdb req.hdr(host) -i yagpdb.redxen.eu or -i yagpdb.redxen.eu:443 or -i yagpdb.redxen.eu:2096 - acl grafana req.hdr(host) -i stats.redxen.eu or -i stats.redxen.eu:443 or -i stats.redxen.eu:2096 - acl nextcloud req.hdr(host) -i cloud.redxen.eu or -i cloud.redxen.eu:443 or -i cloud.redxen.eu:2096 - acl webgit req.hdr(host) -i webgit.redxen.eu or -i webgit.redxen.eu:443 or -i webgit.redxen.eu:2096 - acl transmission req.hdr(host) -i seed.redxen.eu or -i seed.redxen.eu:443 or -i seed.redxen.eu:2096 - acl onlyoffice req.hdr(host) -i office.redxen.eu or -i office.redxen.eu:443 or -i office.redxen.eu:2096 - acl homepage req.hdr(host) -i redxen.eu or -i www.redxen.eu or -i redxen.eu:443 or -i www.redxen.eu:443 or -i redxen.eu:2096 or -i www.redxen.eu:2096 - acl znc req.hdr(host) -i znc.redxen.eu or -i znc.redxen.eu:443 or -i znc.redxen.eu:2096 + acl yagpdb req.hdr(host) -i yagpdb.redxen.eu or -i yagpdb.redxen.eu:443 + acl grafana req.hdr(host) -i stats.redxen.eu or -i stats.redxen.eu:443 + acl nextcloud req.hdr(host) -i cloud.redxen.eu or -i cloud.redxen.eu:443 + acl webgit req.hdr(host) -i webgit.redxen.eu or -i webgit.redxen.eu:443 + acl transmission req.hdr(host) -i seed.redxen.eu or -i seed.redxen.eu:443 + acl onlyoffice req.hdr(host) -i office.redxen.eu or -i office.redxen.eu:443 + acl homepage req.hdr(host) -i redxen.eu or -i www.redxen.eu or -i redxen.eu:443 or -i www.redxen.eu:443 or -i redxen.eu:2096 acl homepage-res res.hdr(host) -i redxen.eu or -i redxen.eu:443 @@ -77,7 +76,6 @@ frontend https use_backend transmission if transmission use_backend onlyoffice if onlyoffice use_backend homepage if homepage - use_backend znc if znc backend homepage server redxen-space rxhome.s3-website.eu-central-1.amazonaws.com:80 @@ -114,6 +112,3 @@ backend transmission backend onlyoffice server onlyoffice-docker cloud_documentserver:80 check http-response set-header Content-Security-Policy default-src\ \'self\';connect-src\ \'self\';font-src\ https:\ data:\ \'self\';script-src\ \'unsafe-eval\'\ \'unsafe-inline\'\ \'self\';style-src\ \'self\'\ \'unsafe-inline\';media-src\ https:\ \'self\';img-src\ https:\ blob:\ data:\ \'self\';frame-src\ \'self\';object-src\ \'none\';block-all-mixed-content;upgrade-insecure-requests - -backend znc - server znc-bouncer irc_znc:7000 check