diff --git a/config/haproxy/APKBUILD b/config/haproxy/APKBUILD index fc811c5..5fe05d9 100644 --- a/config/haproxy/APKBUILD +++ b/config/haproxy/APKBUILD @@ -3,7 +3,7 @@ . ../APKBUILD-config.template -pkgver=2023.05.24.04 +pkgver=2024.03.19.01 pkgrel=0 depends="redxen-secret-letsencrypt-full redxen-data-haproxy-errorpages" checkdepends="haproxy" @@ -15,5 +15,5 @@ check() { } sha512sums=" -04c82c113fb6096a97b38044d55515028eb8309483d31e480bf536b3e4cb00d75a693e5224bb0ac5b25586b40669c0edeae2a4a96f2b5029d5d4c998a748341b main.cfg +1288fc585e3d08e9e497946b43887cc5436c646ddb7e8bed5a1966536956b7193fb6df36436bd375b39a71d26b3c0037527b87fa11c48895dd6b0e99b337625b main.cfg " diff --git a/config/haproxy/main.cfg b/config/haproxy/main.cfg index 84e48eb..4e0e0f8 100644 --- a/config/haproxy/main.cfg +++ b/config/haproxy/main.cfg @@ -84,7 +84,7 @@ frontend http acl btdaemon hdr_beg(host) -i seed.redxen acl packs hdr_beg(host) -i packages.redxen acl cal hdr_beg(host) -i cal.redxen - acl monerod hdr_beg(host) -i monerod.redxen + acl holoiso hdr_beg(host) -i holoiso.redxen redirect location https://en.uncyclopedia.co/wiki/South_Africa code 302 if fedi redirect prefix /web code 302 if btdaemon root @@ -97,7 +97,7 @@ frontend http use_backend backend-btdaemon if btdaemon use_backend backend-packages if packs use_backend backend-radicale if cal - #use_backend backend-monerod if monerod + use_backend backend-holoiso if holoiso # Fallback to wssproxy to bypass SNI/domain filters use_backend backend-wssproxy @@ -118,7 +118,7 @@ backend backend-stats backend backend-git server-template gitea 1 _gitea._tcp.routinginfo.internal - option httpchk HEAD / HTTP/1.1 + option httpchk GET /caskd/corelibs HTTP/1.1 http-check send hdr Host gitea.redxen.eu backend backend-btdown @@ -146,7 +146,7 @@ backend backend-wssproxy http-check send hdr Host localhost http-check expect status 404 -#backend backend-monerod -# server-template monerod 1 _monerod._tcp.routinginfo.internal -# option httpchk POST /json_rpc HTTP/1.1 -# http-check send body \{\"method\"\:\"get_version\"\} hdr Content-Type application/json +backend backend-holoiso + server-template holoiso 1 _holoiso._tcp.routinginfo.internal + option httpchk HEAD / HTTP/1.1 + http-check send hdr Host holoiso.redxen.eu diff --git a/config/nginx/APKBUILD b/config/nginx/APKBUILD index ebd201b..d397d96 100644 --- a/config/nginx/APKBUILD +++ b/config/nginx/APKBUILD @@ -3,17 +3,24 @@ . ../APKBUILD-config.template -pkgver=2022.04.03.04 +pkgver=2024.03.19.02 pkgrel=0 depends="nginx-mod-http-zip nginx-mod-http-dav-ext nginx-mod-http-fancyindex" checkdepends="nginx" -subpackages="$pkgname-seedbox $pkgname-alpine $pkgname-homepage $pkgname-radicale" +subpackages=" + $pkgname-seedbox + $pkgname-alpine + $pkgname-homepage + $pkgname-radicale + $pkgname-holoiso:_default +" source=" main.conf module/seedbox.conf module/alpine.conf module/homepage.conf module/radicale.conf + module/holoiso.conf " package() { @@ -41,6 +48,11 @@ radicale() { _rx_installdir="$_rx_installdir/module" rx_install radicale.conf } +_default() { + _rx_installdir="$_rx_installdir/module" rx_install holoiso.conf +} + + check() { nginx -p / -c main.conf -t } @@ -51,4 +63,5 @@ cb0c4af772feda0b970c69186a5ab2d264ed8a15b6b8fc4e7b50980bc7e054f7af8696a43422a9ef 5ae68165edab56f41e51ad5b608a29121db878aed0309882927207d4ea9ec5e505a78b194bc8df8f943259130300edd4aa49b2e23a4ee705fa9ea761533fd133 alpine.conf 2657b0bdfc001f94159a8cddc928e666cb20055b3df42dd0ec48146c6952c3c7b3957af52612d35d38199fde76ee0c96cb0ea39ed38e13bcc608088c88dc3a88 homepage.conf d4b07e07e320e79497d12764d3b122686236f58a51d8b419e84966628705b5471b0442ae0de0409e9f0ca5d42396b9b36d8c618a77aea33e6c502cdeb0d37f69 radicale.conf +f8c4851de7bbb9b3e215e325d36538c0d092071a1472a3aa14343b85314b1e8d4d2d4976ab2723f49c64757caaf552dae2be859c9542c3e7dbb081e384ea7d55 holoiso.conf " diff --git a/config/nginx/module/holoiso.conf b/config/nginx/module/holoiso.conf new file mode 100644 index 0000000..e847239 --- /dev/null +++ b/config/nginx/module/holoiso.conf @@ -0,0 +1,13 @@ +server { + listen *:7579 so_keepalive=on; + listen [::]:7579 so_keepalive=on; + + location / { + root /var/lib/holoiso-mirror; + autoindex on; + + limit_except GET HEAD { + deny all; + } + } +} diff --git a/data/bindzone/APKBUILD b/data/bindzone/APKBUILD index 64cc839..f472187 100644 --- a/data/bindzone/APKBUILD +++ b/data/bindzone/APKBUILD @@ -3,7 +3,7 @@ . ../APKBUILD-data.template -pkgver=2023.11.09.02 +pkgver=2024.03.19.02 pkgrel=0 checkdepends="bind-tools" makedepends=" @@ -69,6 +69,6 @@ internal() { } sha512sums=" -1d1d2f6d0f68819ae22d8f16fbff535cc147f4e8b55931ffb5898df1712d4d8e7d62a94afa1e7d641385f317494d33c4e8614743b182f283213ae3dca3548ed4 redxen.eu -a74d43a72f5bc64e4aa21e907f2819546d6b7c46d4f8d318e70f40fa1412ce4cccbe82c7e14f3b21c7aa0099bd0c92d1c0b0533866cdbe9a5f045839484ed26a internal +6c5c68f694a016b2ff24f529166542a48c1d6d9e28816f17b41573c39e940eb0c917678cfff3db42bd53c4ddbf40adb74e2d324fd1fa0fe1df1aa188533e184e redxen.eu +8c8c81eeb9fe71918f48645cc2b3e1a30f64295e370c4157def5b2c9e3798553246b89b1ece75e5fcfd93c89c1af6ef1e2791265749385b1f0ee1f7f1476da37 internal " diff --git a/data/bindzone/internal b/data/bindzone/internal index 9e7675b..be7256e 100644 --- a/data/bindzone/internal +++ b/data/bindzone/internal @@ -22,15 +22,6 @@ $TTL 120 12180710.fsn1-dc14.hetzner 86400 A 10.10.0.5 12180711.fsn1-dc14.hetzner 86400 A 10.10.0.6 -; RXV2 -0.tentacle.six 86400 AAAA 2a04:5b81:2060:b00b:5054:ff:fe42:9677 -1.tentacle.six 86400 AAAA 2a04:5b81:2060:b00b:5054:ff:fe33:bd4b -2.tentacle.six 86400 AAAA 2a04:5b81:2060:b00b:5054:ff:fe35:473c -homerouter.six 86400 AAAA 2a04:5b81:2060:b00b::1 -rx2520.six 86400 AAAA 2a04:5b81:2060:b00b:fc54:ff:fe12:622 -rx200.six 86400 AAAA 2a04:5b81:2060:b00b:a236:9fff:fe2c:8a28 - - ; Services node_exporters.prometheus.routinginfo SRV 0 5 7580 12180623.nbg1-dc3.hetzner SRV 0 5 7580 12180621.nbg1-dc3.hetzner @@ -38,11 +29,12 @@ node_exporters.prometheus.routinginfo SRV 0 5 7580 12180623 SRV 0 5 7580 12180710.fsn1-dc14.hetzner SRV 0 5 7580 12180711.fsn1-dc14.hetzner SRV 0 5 9100 a89b55b4-e8ba-448a-873c-47278bbc7db1.vultr.redxen.eu. - SRV 0 5 9100 homerouter.six - SRV 0 5 9100 rx2520.six - SRV 0 5 9100 rx200.six -libvirt.prometheus.routinginfo SRV 0 5 9177 rx2520.six - SRV 0 5 9177 rx200.six + SRV 0 5 9100 lakewood.united-states.redxen.eu. + SRV 0 5 9100 thetford-mines.canada.redxen.eu. + SRV 0 5 9100 tarui.japan.redxen.eu. + SRV 0 5 9100 izmaylovo.russia.redxen.eu. +libvirt.prometheus.routinginfo SRV 0 5 9177 tarui.japan.redxen.eu. + SRV 0 5 9177 izmaylovo.russia.redxen.eu. unbound.prometheus.routinginfo SRV 0 5 7583 12180623.nbg1-dc3.hetzner SRV 0 5 7583 12180621.nbg1-dc3.hetzner SRV 0 5 7583 12180625.nbg1-dc3.hetzner @@ -51,9 +43,9 @@ unbound.prometheus.routinginfo SRV 0 5 7583 12180623 frontends.prometheus.routinginfo SRV 0 5 7581 12180621.nbg1-dc3.hetzner SRV 0 5 7581 12180711.fsn1-dc14.hetzner postgresql.prometheus.routinginfo SRV 0 5 7582 12180625.nbg1-dc3.hetzner -ceph.prometheus.routinginfo SRV 0 5 9283 0.tentacle.six - SRV 0 5 9283 1.tentacle.six - SRV 0 5 9283 2.tentacle.six +ceph.prometheus.routinginfo SRV 0 5 9283 leigh.united-kingdom.redxen.eu. + SRV 0 5 9283 dumraon.india.redxen.eu. + SRV 0 5 9283 flying-fish-cove.christmas-island.redxen.eu. telegraf.prometheus.routinginfo SRV 0 5 7584 12180623.nbg1-dc3.hetzner SRV 0 5 7584 12180621.nbg1-dc3.hetzner SRV 0 5 7584 12180625.nbg1-dc3.hetzner @@ -66,6 +58,7 @@ _gitssh._tcp.routinginfo SRV 0 5 7571 12180711 _transmission._tcp.routinginfo SRV 0 5 7572 12180710.fsn1-dc14.hetzner _root._tcp.routinginfo SRV 0 5 7575 12180710.fsn1-dc14.hetzner _packages._tcp.routinginfo SRV 0 5 7574 12180710.fsn1-dc14.hetzner +_holoiso._tcp.routinginfo SRV 0 5 7579 12180710.fsn1-dc14.hetzner _seedown._tcp.routinginfo SRV 0 5 7576 12180710.fsn1-dc14.hetzner _radicale._tcp.routinginfo SRV 0 5 7578 12180710.fsn1-dc14.hetzner _wssproxy._tcp.routinginfo SRV 0 5 7591 12180621.nbg1-dc3.hetzner diff --git a/data/bindzone/redxen.eu b/data/bindzone/redxen.eu index e1e3618..2f47f7d 100644 --- a/data/bindzone/redxen.eu +++ b/data/bindzone/redxen.eu @@ -44,6 +44,17 @@ masami.falkenstein.hetzner CNAME 12180710.fsn1-dc lin.falkenstein.hetzner CNAME 12180711.fsn1-dc14.hetzner mika.frankfurt.vultr CNAME a89b55b4-e8ba-448a-873c-47278bbc7db1.vultr +; RXV2 +lakewood.united-states 86400 AAAA 2a04:5b81:2060:b00b::1 +thetford-mines.canada 86400 AAAA 2a04:5b81:2060:b00b:5054:ff:fe81:cb62 + +tarui.japan 86400 AAAA 2a04:5b81:2060:b00b:fc54:ff:fe12:622 +izmaylovo.russia 86400 AAAA 2a04:5b81:2060:b00b:a236:9fff:fe2c:8a28 + +leigh.united-kingdom 86400 AAAA 2a04:5b81:2060:b00b:5054:ff:fe42:9677 +dumraon.india 86400 AAAA 2a04:5b81:2060:b00b:5054:ff:fe33:bd4b +flying-fish-cove.christmas-island 86400 AAAA 2a04:5b81:2060:b00b:5054:ff:fe35:473c + ; ; Servers ; @@ -65,6 +76,7 @@ git CNAME @ stats CNAME @ sd CNAME @ packages CNAME @ +holoiso CNAME @ seed CNAME @ cal CNAME @ wssproxy CNAME @ @@ -94,8 +106,8 @@ imap CNAME 12180623.nbg1-dc _DMARC TXT "v=DMARC1; p=quarantine; rua=mailto:postmaster@redxen.eu; ruf=mailto:postmaster@redxen.eu; fo=1; pct=100" ; ACME -_acme-challenge 300 TXT "XbfrvEynJfjWtD1isc0z9k68MFF_X4gg26ZchVqU7Kk" -_acme-challenge 300 TXT "uV4qxHCQRwIC2HEhVpwr-kl5qGpEN7uo9F2RdE4fZHs" +_acme-challenge 300 TXT "6p94DiV33m01sJ9FKRmz_r0iJbrrGr7q7eegfi7Fbco" +_acme-challenge 300 TXT "x_XlfCidLDW6rZ92kZoZqF4-W66kiLJ2UgFdQ18ll0E" ; Autodiscovery _mumble._tcp SRV 0 5 64738 12180623.nbg1-dc3.hetzner