Compare commits

...

5 Commits

Author SHA1 Message Date
Alex D. 622416e84b
Bump post-rollback 2024-03-30 18:39:41 +00:00
Alex D. c9184d54eb
Remove unused assets 2024-03-30 18:39:11 +00:00
Alex D. d8015da4d9
Bump homepage 2024-03-30 18:38:27 +00:00
Alex D. d1847ed909
Rollback holoiso preps 2024-03-30 18:36:39 +00:00
Alex D. 1b230b465f
Refresh certs and remove bindzone record 2024-03-30 18:32:12 +00:00
14 changed files with 33 additions and 102 deletions

View File

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

View File

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

View File

@ -84,7 +84,6 @@ 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 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 +96,6 @@ frontend http
use_backend backend-btdaemon if btdaemon
use_backend backend-packages if packs
use_backend backend-radicale if cal
use_backend backend-holoiso if holoiso
# Fallback to wssproxy to bypass SNI/domain filters
use_backend backend-wssproxy
@ -145,8 +143,3 @@ backend backend-wssproxy
option httpchk HEAD / HTTP/1.1
http-check send hdr Host localhost
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

View File

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

View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template
pkgver=2023.10.21.01
pkgver=2024.01.30.02
pkgrel=0
subpackages="$pkgname-sysctl"
source="

View File

@ -3,7 +3,7 @@
. ../APKBUILD-data.template
pkgver=2024.03.19.02
pkgver=2024.03.30.01
pkgrel=0
checkdepends="bind-tools"
makedepends="
@ -69,6 +69,6 @@ internal() {
}
sha512sums="
6c5c68f694a016b2ff24f529166542a48c1d6d9e28816f17b41573c39e940eb0c917678cfff3db42bd53c4ddbf40adb74e2d324fd1fa0fe1df1aa188533e184e redxen.eu
8c8c81eeb9fe71918f48645cc2b3e1a30f64295e370c4157def5b2c9e3798553246b89b1ece75e5fcfd93c89c1af6ef1e2791265749385b1f0ee1f7f1476da37 internal
fcf425660f7eb2c8f0b11f191ad0137ec7fbb166e6f1a9b66abe136cfdccb7fcd0adb6cdf4a76b82b1c7043f4f735fdce0869bb4bf5514a035439b7aa35dcc7b redxen.eu
8d96e3ec3124755f2308d2dc42b0bb450d296398f5610e5bdc1dd24aad4468193b4c8f86c5ce254cc89bf5eb1e2b28dd3594dc7e4cfda5bac87237f216d8199f internal
"

View File

@ -58,7 +58,6 @@ _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

View File

@ -76,7 +76,6 @@ git CNAME @
stats CNAME @
sd CNAME @
packages CNAME @
holoiso CNAME @
seed CNAME @
cal CNAME @
wssproxy CNAME @
@ -106,8 +105,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 "6p94DiV33m01sJ9FKRmz_r0iJbrrGr7q7eegfi7Fbco"
_acme-challenge 300 TXT "x_XlfCidLDW6rZ92kZoZqF4-W66kiLJ2UgFdQ18ll0E"
_acme-challenge 300 TXT "S5Xssuyk22Hm0S_yVn0y0l8J559HLAN9Zc_wqEGRO3g"
_acme-challenge 300 TXT "epoT4RKnG1T7hov-U6uoQfJIynFcmiBPTTNl36Gsy8c"
; Autodiscovery
_mumble._tcp SRV 0 5 64738 12180623.nbg1-dc3.hetzner

View File

@ -3,16 +3,16 @@
. ../APKBUILD-data.template
pkgver=2022.04.02.01
pkgver=2024.01.02.01
pkgrel=0
makedepends="imagemagick"
source="logo.svg"
_customroot="/usr/share/gitea/custom"
_rx_installdir="$_customroot/public/img"
_rx_installdir="$_customroot/public/assets/img"
_rx_fperm=444 # Public, static resources
build() {
sizes="120 180 192 512 880"
sizes="180 512"
for i in $sizes; do
msg "Scaling svg to $i"
magick -size "$i"x"$i" logo.svg \( +clone -threshold 101% -fill white -draw 'circle %[fx:int(w/2)],%[fx:int(h/2)] %[fx:int(w/2)],%[fx:80+int(h/2)]' \) -channel-fx '| gray=>alpha' logo-"$i".png
@ -20,17 +20,12 @@ build() {
}
package() {
rx_install logo-120.png gitea-sm.png
rx_install logo-180.png favicon.png
rx_install logo-180.png apple-touch-icon.png
rx_install logo-192.png gitea-192.png
rx_install logo-512.png gitea-512.png
rx_install logo-512.png logo.png
rx_install logo-880.png gitea-lg.png
rx_install logo.svg logo.svg
rx_install logo.svg favicon.svg
rx_install logo.svg gitea-safari.svg
}
sha512sums="

View File

@ -3,9 +3,9 @@
. ../APKBUILD-data.template
pkgver=2023.04.02.01
pkgver=2024.03.14.01
pkgrel=0
_commit="b41818e0f07675e511c61c231779fc5e7e254811"
_commit="44b3d1c3c825a311c7e5071b553de312217ca922"
url="https://git.redxen.eu/RedXen/Homepage"
makedepends="nodejs-less"
source="https://git.redxen.eu/RedXen/Homepage/archive/$_commit.tar.gz"
@ -23,5 +23,5 @@ package() {
sha512sums="
5a1094c997480dea2d98ea68cfe9883ec864ab064d3f4a5485e6cf1c2d087bf1a04029a3be834dad9320d4c9255d3e12bdfd8a71d491e6effc2c368e5034f293 b41818e0f07675e511c61c231779fc5e7e254811.tar.gz
78bd9e7f651c05b2058c8874101a6ff6a88432f212ea53c66ec2873d3c508f8eb6ff8a362fe59fd1df5dc9eecd682afc71f35473f7d37fbb4456916d70936fb5 44b3d1c3c825a311c7e5071b553de312217ca922.tar.gz
"

View File

@ -3,7 +3,7 @@
. ../APKBUILD-secret.template
pkgver=2024.01.07.01
pkgver=2024.03.30.01
pkgrel=0
subpackages="$pkgname-private $pkgname-public $pkgname-full $pkgname-ca $pkgname-chain"
checkdepends="openssl"
@ -55,6 +55,6 @@ ca() {
sha512sums="
394eabb864e83c98d5986ccaee3098db0d4fcb3e7e8dc1bb3e940e8de1108deb8a88081bd0b4b84dbdf60d79978a0c40ece8a2e5db0e6af2f8f0336c2d527a2e private.key
7d36e95434bdca6643f1a219169742c4c8ce7f58bb50b3d8fef3809338fae835719096c374fdcb67b6097b95830f6352f8a8f712514a173d6d811f5ca15a7683 public.pem
6193ff52acda2b57fcf8b4881e93bf451577b77068f5e027fd8ccb7cea1e283e084e97bc7c33056eabc46dc1af903e865919c9da2789f2ae644ec2993ac74e0a ca.pem
b921b188c64cfc5f1499abac52650f7e12ef1aabc800749ccff5e60920439da39c2f661cfddd315eb8c6d8bfad664776fe59916b3ce7e2b629d1f78bc1af45f2 public.pem
5ab45ace8787eb7eec6fb71919a0fa2a82cf094ccea9303a7be51413c390d999c40ec766076a37cdd3b90b475b0ab13ded76e6fcd46771f727c4c1ae8deecef0 ca.pem
"

View File

@ -29,35 +29,3 @@ HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
nLRbwHOoq7hHwg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB
AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC
ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL
wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D
LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK
4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5
bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y
sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ
Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4
FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc
SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql
PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND
TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1
c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx
+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB
ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu
b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E
U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu
MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW
9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG
WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
-----END CERTIFICATE-----

View File

@ -1,7 +1,7 @@
-----BEGIN CERTIFICATE-----
MIIE7DCCA9SgAwIBAgISBErauxtlNoFKp1/kwQGyECNuMA0GCSqGSIb3DQEBCwUA
MIIE7DCCA9SgAwIBAgISBG6XU6lF+w7KkKvHblYzyr1RMA0GCSqGSIb3DQEBCwUA
MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
EwJSMzAeFw0yNDAxMDcxMzMxNDZaFw0yNDA0MDYxMzMxNDVaMBQxEjAQBgNVBAMT
EwJSMzAeFw0yNDAzMzAxNzI1MzdaFw0yNDA2MjgxNzI1MzZaMBQxEjAQBgNVBAMT
CXJlZHhlbi5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeD0yl2
aQaIK73GpBOA1JpdesESlCvjEw9g84uN8Yk4fG77wGcDZw1Ja4vrj9MBmzvnLMUe
j5mizZP2L3eIgx3KKsuIT4hClGSR/oeN0cL93RUYAwZqW1q8NBuAxu1QPhXn82ZK
@ -10,20 +10,20 @@ D0cX7BQy+GFH4XSAWSMB1w+HhLaKUESaBfSvAuX6awUu1JfbJW0yUoG+We9/RuMI
44TDLGfVujmpRYgcOlJRBQiSXi/pMie1kdQqev0uFYRCSuM6QTkHlPYRrPXHPZks
vmqRDe1do7TgnFkCAwEAAaOCAhgwggIUMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU
PIwzPDkx1+DgEji18Q8rc+Y0dXAwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA5h+v
/5eDjZg72Si+KDYT4z09SwYeiyIwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA5h+v
nYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMuby5s
ZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8wIQYD
VR0RBBowGIILKi5yZWR4ZW4uZXWCCXJlZHhlbi5ldTATBgNVHSAEDDAKMAgGBmeB
DAECATCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2ADtTd3U+LbmAToswWwb+QDtn
2E/D9Me9AA0tcm/h+tQXAAABjORWQIgAAAQDAEcwRQIgOW+vdqpDGQut5/q7V7By
ENbP8AYsqx2Z+N9GCxts4NICIQCfG6ZG77rQ1PcQuD9qyKYbJjDd+tSq5ayPNe8F
r8iPcAB2AO7N0GTV2xrOxVy3nbTNE6Iyh0Z8vOzew1FIWUZxH7WbAAABjORWQJEA
AAQDAEcwRQIhAPnDcpZ/+isf84VmHIlSfUYG/+sDmPFTiWCkRrcKqXIHAiBpl58g
bvu3VPLdgakZHCgEaiZuHB1YFKIT6M1YMlcULzANBgkqhkiG9w0BAQsFAAOCAQEA
nKgLck0h4zDi4UTQF+MWSX1i2uvWND4XsuIFn9pS9lzmjUzFTzSPE9el65C8/vYk
12VEfwVzNIZ+34l5GQy+FcF0CWlJ5DckuruU3Ag3F+c05jj3wNQTxYGRv9Eg/nfO
HMT8YD/12QTVkXYVjI22kdJ7P9hDPNvd8vqdOdQVSQ59kmA0OBrXl/hDGzmW0Iki
cBEx/RLxaaP+3vFMiluVdpNDzP999ytNBTdFeEw/6Ywenrdq9VnLJ3FGk3b+5Zjp
L0zg8OMSmPq8D8UdK4XOC0lEANH4DSojfP1MtIcHlHEXDUcKy2uTiK3++EpgWYxN
YoTR4b8fAvwpkoDI7fjoZw==
DAECATCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2AO7N0GTV2xrOxVy3nbTNE6Iy
h0Z8vOzew1FIWUZxH7WbAAABjpCcLcMAAAQDAEcwRQIhAOPNvwFiX7kvxOzndY6g
8TLXuBUXUIyfvzZneP3yFUCyAiB+7qpszkfPy5VAV7EtBsDDpTWhccjYerwAREHJ
dzFovgB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0sgdm7v6s52IRzAAABjpCcLbkA
AAQDAEcwRQIgYxrkxBtP8kDB6/oIjONsu+aVZscQwb12TBQ7BHj78Z8CIQDYRbMU
NhyNwfTys12ZrG+sXykWJS8GVfz8X8gbSnZLszANBgkqhkiG9w0BAQsFAAOCAQEA
cVc1Y6yNSrdQw1lrXAbKO9kwYSHY6q0k3OEcmqvuLuvy0otytqQ+K79D1T2KuNMV
3vgCzPsnDZ3YHcp1fsMsoFuGUly68wIYLCCMq4V/PxyqlG3MilVV66LhTpL22BsB
FCjws4Qz4nMVyPCsKLvbZA3VMQl+y98GmIWGJyCCS1liMDqAIzHv3KCoBWIrWxke
3SxAEkSFUfvVYVQjNdp933BkGEiHVRVigx+RRSw1SGSzpOBXuuBqg3F5NnZTXvRo
EMta4tN3MSheqXhy/h9AP932RMCUXNLJH1kbMF6zBfjV2VJ9V6dqDVsItlZI0PnE
7v3eidvu+ueaghK15vatmg==
-----END CERTIFICATE-----