From e5b91adc39803175fa3921aaeaed7407496149e8 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Sat, 16 Jan 2021 14:55:41 +0000 Subject: [PATCH] Remove pleroma --- configs/haproxy/APKBUILD | 4 ++-- configs/haproxy/main.cfg | 13 +++++++------ configs/unbound/APKBUILD | 8 ++++---- configs/unbound/internal.conf | 5 +---- configs/unbound/zones/redxen.eu | 2 +- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/configs/haproxy/APKBUILD b/configs/haproxy/APKBUILD index 34c8607..b3f09c7 100644 --- a/configs/haproxy/APKBUILD +++ b/configs/haproxy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-config-haproxy -pkgver=2021.01.05 +pkgver=2021.01.14 pkgrel=0 pkgdesc="HAProxy frontend configuration" url="https://git.redxen.eu/RedXen" @@ -21,4 +21,4 @@ check() { haproxy -c -f main.cfg } -sha512sums="4c95f03028547baf62008e4e91723b43d99931c804a906d410b6f213b3310ffd5d14ca9aeae537438e41c6def5b3586fe017c54db667ebe07387f4655a05edeb main.cfg" +sha512sums="25e3e901256837ee5ca762501b4595ba8f772ef8a616b19a2fb4ebd654e6105611a0e2062504d66ab838ade07c5a0cf5fca62e05fd1992f2636b9f5ad958c680 main.cfg" diff --git a/configs/haproxy/main.cfg b/configs/haproxy/main.cfg index f957e12..b1f53ad 100644 --- a/configs/haproxy/main.cfg +++ b/configs/haproxy/main.cfg @@ -6,11 +6,12 @@ global defaults mode http - retries 1 + retries 3 option forwardfor option http-keep-alive option tcp-smart-connect option tcpka + option abortonclose balance roundrobin compression algo gzip timeout http-request 10s @@ -62,7 +63,7 @@ frontend http use_backend backend-root if { hdr(host) -i redxen.eu } use_backend backend-grafana if { hdr_beg(host) -i stats } - use_backend backend-pleroma if { hdr_beg(host) -i social } +# use_backend backend-pleroma if { hdr_beg(host) -i social } use_backend backend-gitea if { hdr_beg(host) -i git } use_backend backend-seedown if { hdr_beg(host) -i sd } @@ -90,10 +91,10 @@ frontend http option httpchk HEAD / HTTP/1.1 http-check send hdr Host sd.redxen.eu - backend backend-pleroma - server-template pleroma 1 _pleroma._tcp.routinginfo.redxen.localhost - option httpchk HEAD / HTTP/1.1 - http-check send hdr Host social.redxen.eu +# backend backend-pleroma +# server-template pleroma 1 _pleroma._tcp.routinginfo.redxen.localhost +# option httpchk HEAD / HTTP/1.1 +# http-check send hdr Host social.redxen.eu backend backend-gitea server-template gitea 1 _gitea._tcp.routinginfo.redxen.localhost diff --git a/configs/unbound/APKBUILD b/configs/unbound/APKBUILD index 780ebf8..05cdddd 100644 --- a/configs/unbound/APKBUILD +++ b/configs/unbound/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-config-unbound -pkgver=2021.01.13 -pkgrel=4 +pkgver=2021.01.14 +pkgrel=0 pkgdesc="Unbound configurations and some other stuff." url="https://git.redxen.eu/RedXen" arch="noarch" @@ -61,6 +61,6 @@ sha512sums="f402b87071a3059992242b7dbce0aaea2f20ec4e5fc4e855160d5ebc75be7dd3d4cb d3754ced9d8055ff7f1d364a93c403bba3f220a60ea519bceee5e9c43112d6a00d20d15cf659fdd6ad6834cf14afd6ecb5d9e1497ff2932572fd970750655749 base.conf 75709787e0872197c83def93b343550934f6b2e4903873aaf72f357fb8b4a1d7c5b8ba84913f052ad01aeca03f58ca589a22bf867c1c2e40e01f9588c7c580c4 acl.conf d94ad338e2ea43c3ecdc62c861eddc0bb706807b738dd985309bcdf0b5fb435d7260bf272e2bbe40a774ec5b8fa49cbf23624c2c5213eea94f4f14aa3720abfa rctrl.conf -7288371d91d05930695a448464260e1f849a4294647c1e0969a9889443e314aaa2262c3602786c4a1bd208d6ca63f1ff6e4f697fc066913381f54d9fa843be9d internal.conf +a9edb1504533ed3e54dd6fa193ea30680b760580ff218466d2ad5c2509e7738f378659850f30df506ad427867822b72d11764407505c62c5ec18c1cd6cb0efa5 internal.conf 28c917fe7f69643887097553312c4f1ffc747dffdbf150430e6c4b2e5833567922810716cb59a27887915664777ac3263be3c826956f504499f0ebdcc0b3aac5 auth-zones.conf -3d62401e844bed8800cc2a986cbe68c8412d451321f23536c9eddc91b11ca5f2f8525af10398fced05452ce7bd75adcc8327cc4580a4034bbbc3aaf8da52ff65 redxen.eu" +3ef758b56b89a4a90cd3f2a6bb6e2d265f194f1f9406042071df336c9124bad7167da443685a528518580f8f853060547b0db763726003cb1143f28ab4f59767 redxen.eu" diff --git a/configs/unbound/internal.conf b/configs/unbound/internal.conf index 63c7b7d..4c945c8 100644 --- a/configs/unbound/internal.conf +++ b/configs/unbound/internal.conf @@ -21,7 +21,7 @@ server: local-data: "_seedown._tcp.routinginfo.redxen.localhost. 60 IN SRV 0 5 7574 9013723.fsn1-dc14.hetzner.redxen.localhost." local-data: "_gitea._tcp.routinginfo.redxen.localhost. 60 IN SRV 0 5 7570 9227948.nbg1-dc3.hetzner.redxen.localhost." local-data: "_gitssh._tcp.routinginfo.redxen.localhost. 60 IN SRV 0 5 7572 9227948.nbg1-dc3.hetzner.redxen.localhost." - local-data: "_pleroma._tcp.routinginfo.redxen.localhost. 60 IN SRV 0 5 8088 6051167.nbg1-dc3.hetzner.redxen.localhost." + # local-data: "_pleroma._tcp.routinginfo.redxen.localhost. 60 IN SRV 0 5 8088 6051167.nbg1-dc3.hetzner.redxen.localhost." # Services (no CNAME/SRV support) local-data: "postgresql.routinginfo.redxen.localhost. 86400 IN AAAA 201:5d63:154:f0c6:9789:1899:6acb:1805" @@ -29,6 +29,3 @@ server: local-data: "influxdb.routinginfo.redxen.localhost. 86400 IN AAAA 201:5d63:154:f0c6:9789:1899:6acb:1805" local-data: "rspamd.routinginfo.redxen.localhost. 86400 IN AAAA 200:2749:8af:bdf9:f011:997e:7bbb:35f3" local-data: "opendkim.routinginfo.redxen.localhost. 86400 IN AAAA 201:3b84:3e03:9e0f:4885:fb55:45f6:ebbd" - - # Legacy machines (pre-migration) - local-data: "6051167.nbg1-dc3.hetzner.redxen.localhost. 86400 IN A 10.0.0.4" diff --git a/configs/unbound/zones/redxen.eu b/configs/unbound/zones/redxen.eu index 3972027..58eb054 100644 --- a/configs/unbound/zones/redxen.eu +++ b/configs/unbound/zones/redxen.eu @@ -50,7 +50,7 @@ masami.nurnberg.hetzner 86400 IN CNAME 9227948.nbg1-dc3 ; ; Frontend -social 86400 IN CNAME @ +; social 86400 IN CNAME @ ; on HOLD git 86400 IN CNAME @ mumble 86400 IN CNAME @ stats 86400 IN CNAME @