RedXen/aports
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rollback holoiso preps

Browse Source
This commit is contained in:
Alex D. 2024-03-30 18:36:39 +00:00
parent 1b230b465f
commit d1847ed909
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
5 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PORT-ALLOCATION
View File

@ -33,8 +33,6 @@ Internal ports: 7500-7600
Radicale: 7578 Radicale: 7578
Grafana: 7577 Grafana: 7577
Radicale: 7591 Radicale: 7591
Monerod:
RPC: 7579
Prometheus: Prometheus:
node: 7580 node: 7580
pgsql: 7582 pgsql: 7582

4
config/haproxy/APKBUILD
View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template . ../APKBUILD-config.template
pkgver=2024.03.19.01 pkgver=2024.03.19.02
pkgrel=0 pkgrel=0
depends="redxen-secret-letsencrypt-full redxen-data-haproxy-errorpages" depends="redxen-secret-letsencrypt-full redxen-data-haproxy-errorpages"
checkdepends="haproxy" checkdepends="haproxy"
@ -15,5 +15,5 @@ check() {
} }
sha512sums=" sha512sums="
1288fc585e3d08e9e497946b43887cc5436c646ddb7e8bed5a1966536956b7193fb6df36436bd375b39a71d26b3c0037527b87fa11c48895dd6b0e99b337625b main.cfg 14c731de4c700d0579eaf96baf1ebcee0981462d56d9345d2bc694f1810eb4f72b97744b4e319cd48630f17c50f34936d78973c94f82e7d608d764eaf5c87edf main.cfg
" "

7
config/haproxy/main.cfg
View File

@ -84,7 +84,6 @@ frontend http
acl btdaemon hdr_beg(host) -i seed.redxen acl btdaemon hdr_beg(host) -i seed.redxen
acl packs hdr_beg(host) -i packages.redxen acl packs hdr_beg(host) -i packages.redxen
acl cal hdr_beg(host) -i cal.redxen acl cal hdr_beg(host) -i cal.redxen
acl holoiso hdr_beg(host) -i holoiso.redxen
redirect location https://en.uncyclopedia.co/wiki/South_Africa code 302 if fedi redirect location https://en.uncyclopedia.co/wiki/South_Africa code 302 if fedi
redirect prefix /web code 302 if btdaemon root redirect prefix /web code 302 if btdaemon root
@ -97,7 +96,6 @@ frontend http
use_backend backend-btdaemon if btdaemon use_backend backend-btdaemon if btdaemon
use_backend backend-packages if packs use_backend backend-packages if packs
use_backend backend-radicale if cal use_backend backend-radicale if cal
use_backend backend-holoiso if holoiso
# Fallback to wssproxy to bypass SNI/domain filters # Fallback to wssproxy to bypass SNI/domain filters
use_backend backend-wssproxy use_backend backend-wssproxy
@ -145,8 +143,3 @@ backend backend-wssproxy
option httpchk HEAD / HTTP/1.1 option httpchk HEAD / HTTP/1.1
http-check send hdr Host localhost http-check send hdr Host localhost
http-check expect status 404 http-check expect status 404
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

10
config/nginx/APKBUILD
View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template . ../APKBUILD-config.template
pkgver=2024.03.19.02 pkgver=2024.03.30.01
pkgrel=0 pkgrel=0
depends="nginx-mod-http-zip nginx-mod-http-dav-ext nginx-mod-http-fancyindex" depends="nginx-mod-http-zip nginx-mod-http-dav-ext nginx-mod-http-fancyindex"
checkdepends="nginx" checkdepends="nginx"
@ -12,7 +12,6 @@ subpackages="
$pkgname-alpine $pkgname-alpine
$pkgname-homepage $pkgname-homepage
$pkgname-radicale $pkgname-radicale
$pkgname-holoiso:_default
" "
source=" source="
main.conf main.conf
@ -20,7 +19,6 @@ source="
module/alpine.conf module/alpine.conf
module/homepage.conf module/homepage.conf
module/radicale.conf module/radicale.conf
module/holoiso.conf
" "
package() { package() {
@ -48,11 +46,6 @@ radicale() {
_rx_installdir="$_rx_installdir/module" rx_install radicale.conf _rx_installdir="$_rx_installdir/module" rx_install radicale.conf
} }
_default() {
_rx_installdir="$_rx_installdir/module" rx_install holoiso.conf
}
check() { check() {
nginx -p / -c main.conf -t nginx -p / -c main.conf -t
} }
@ -63,5 +56,4 @@ cb0c4af772feda0b970c69186a5ab2d264ed8a15b6b8fc4e7b50980bc7e054f7af8696a43422a9ef
5ae68165edab56f41e51ad5b608a29121db878aed0309882927207d4ea9ec5e505a78b194bc8df8f943259130300edd4aa49b2e23a4ee705fa9ea761533fd133 alpine.conf 5ae68165edab56f41e51ad5b608a29121db878aed0309882927207d4ea9ec5e505a78b194bc8df8f943259130300edd4aa49b2e23a4ee705fa9ea761533fd133 alpine.conf
2657b0bdfc001f94159a8cddc928e666cb20055b3df42dd0ec48146c6952c3c7b3957af52612d35d38199fde76ee0c96cb0ea39ed38e13bcc608088c88dc3a88 homepage.conf 2657b0bdfc001f94159a8cddc928e666cb20055b3df42dd0ec48146c6952c3c7b3957af52612d35d38199fde76ee0c96cb0ea39ed38e13bcc608088c88dc3a88 homepage.conf
d4b07e07e320e79497d12764d3b122686236f58a51d8b419e84966628705b5471b0442ae0de0409e9f0ca5d42396b9b36d8c618a77aea33e6c502cdeb0d37f69 radicale.conf d4b07e07e320e79497d12764d3b122686236f58a51d8b419e84966628705b5471b0442ae0de0409e9f0ca5d42396b9b36d8c618a77aea33e6c502cdeb0d37f69 radicale.conf
f8c4851de7bbb9b3e215e325d36538c0d092071a1472a3aa14343b85314b1e8d4d2d4976ab2723f49c64757caaf552dae2be859c9542c3e7dbb081e384ea7d55 holoiso.conf
" "

13
config/nginx/module/holoiso.conf
View File

@ -1,13 +0,0 @@
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;
}
}
}