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

Compare commits

base: RedXen:b2feaf0fba154148fbe303c4ca206f9c2d60a537
Branches Tags
RedXen:master
...
compare: RedXen:9a58629def1671ad6665563c7bdb29446185c4bd
Branches Tags
RedXen:master

4 Commits
b2feaf0fba ... 9a58629def

Author SHA1 Message Date
Alex D. 9a58629def
Add gost 2023-05-30 20:20:53 +00:00
Alex D. cb74d08bb3
Update letsencrypt cert 2023-05-30 20:18:01 +00:00
Alex D. 1018c76633
Fixup wssproxy 2023-05-30 20:16:56 +00:00
Alex D. 19814aa16c
Enable internal exporters 2023-05-30 20:16:12 +00:00
13 changed files with 80 additions and 40 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,6 +7,7 @@ secret/radicale-httpauth/secret
secret/seedbox-mount/secret
secret/letsencrypt/private.key
openrc/vtun/secret
openrc/gost/secret
config/telegraf/secret
config/grafana/secret

4
config/haproxy/APKBUILD
View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template
pkgver=2022.04.02.02
pkgver=2023.05.24.04
pkgrel=0
depends="redxen-secret-letsencrypt-full redxen-data-haproxy-errorpages"
checkdepends="haproxy"
@ -15,5 +15,5 @@ check() {
}
sha512sums="
45bd2aa36469225968df94843d4548064f601ebc7d353fed75d8e50cd1eb0edad12e9ba07e1d05cd88ce2597cb4d411585a613f349ceb08fb5061e30cc6be97b main.cfg
04c82c113fb6096a97b38044d55515028eb8309483d31e480bf536b3e4cb00d75a693e5224bb0ac5b25586b40669c0edeae2a4a96f2b5029d5d4c998a748341b main.cfg
"

7
config/haproxy/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 wssproxy hdr_beg(host) -i wssproxy.redxen
acl monerod hdr_beg(host) -i monerod.redxen
redirect location https://en.uncyclopedia.co/wiki/South_Africa code 302 if fedi
@ -98,8 +97,9 @@ frontend http
use_backend backend-btdaemon if btdaemon
use_backend backend-packages if packs
use_backend backend-radicale if cal
use_backend backend-wssproxy if wssproxy
#use_backend backend-monerod if monerod
# Fallback to wssproxy to bypass SNI/domain filters
use_backend backend-wssproxy
backend backend-home
server-template root 1 _root._tcp.routinginfo.internal
@ -143,7 +143,8 @@ backend backend-radicale
backend backend-wssproxy
server-template wssproxy 1 _wssproxy._tcp.routinginfo.internal
option httpchk HEAD / HTTP/1.1
http-check send hdr Host wss-proxy.redxen.eu
http-check send hdr Host localhost
http-check expect status 404
#backend backend-monerod
# server-template monerod 1 _monerod._tcp.routinginfo.internal

6
config/nftables/APKBUILD
View File

@ -3,14 +3,14 @@
. ../APKBUILD-config.template
pkgver=2022.06.17.01
pkgver=2023.05.24.01
pkgrel=0
options="!check" # check requires root?
subpackages="
$pkgname-base
$pkgname-openssh
$pkgname-vtun
$pkgname-gost
$pkgname-haproxy:_defmodule
$pkgname-murmur:_defmodule
$pkgname-dovecot:_defmodule
@ -52,7 +52,7 @@ openssh() {
_module "$_modname"
}
vtun() {
gost() {
_modname="${subpkgname##$pkgname-}"
install_if="$pkgname redxen-openrc-$_modname"
_module "$_modname"

10
config/unbound/APKBUILD
View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template
pkgver=2022.03.26.02
pkgver=2023.05.24.01
pkgrel=0
depends="alpine-baselayout ca-certificates-bundle dns-root-hints dnssec-root"
checkdepends="unbound"
@ -13,13 +13,11 @@ source="
acl.conf
rctrl.conf
wireguard.conf
vtun.conf
"
subpackages="
$pkgname-acl
$pkgname-rctrl
$pkgname-wireguard
$pkgname-vtun
"
_zones="
@ -59,12 +57,6 @@ wireguard() {
_rx_installdir="$_rx_installdir/module" rx_install wireguard.conf
}
vtun() {
install_if="$pkgname redxen-openrc-vtun"
_rx_installdir="$_rx_installdir/module" rx_install vtun.conf
}
_zone_ins() {
_modname="${subpkgname##${pkgname}-}"
_authname="${_modname##auth-}"

6
data/bindzone/APKBUILD
View File

@ -3,7 +3,7 @@
. ../APKBUILD-data.template
pkgver=2023.03.31.01
pkgver=2023.05.30.01
pkgrel=0
checkdepends="bind-tools"
makedepends="
@ -69,6 +69,6 @@ internal() {
}
sha512sums="
ab640fe30ff4c545ff37bbf89b2e9b3dd4ca861fabaec7f6dff51faec2db488b975c06fdab99efe04b4869e008538a1651e247cd6cb48fec15461f5892579fe5 redxen.eu
bf3d6cef8b6add8e9923a3e25822871e34230db2b5bcc7bd872b344f2f5af9560adb26e99de61c10096494c9127693b153dcd943ff3b66d0e85f30f0288e3ade internal
300aa574e80f952ceeb50d333d70fbe7dea08e81a1533b0181ac5004370c833b2ccfc0fdbddc807e3548d634335f87a135514434e9f5d7a7c2881b6e7b6d6a40 redxen.eu
1e6d18e587a7a7310d1666f215b1bd782c1e91d458f32e74cb1fdd5cedd3caeff300b1d36ad9eacc0dbd1f183fe393d8454fec31c425a3436726d7e9bd9d000a internal
"

6
data/bindzone/internal
View File

@ -23,6 +23,8 @@ $TTL 120
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
; Services
@ -39,7 +41,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 9128 2.tentacle.six
ceph.prometheus.routinginfo SRV 0 5 9283 0.tentacle.six
ceph.prometheus.routinginfo SRV 0 5 9283 1.tentacle.six
ceph.prometheus.routinginfo SRV 0 5 9283 2.tentacle.six
_grafana._tcp.routinginfo SRV 0 5 7577 12180621.nbg1-dc3.hetzner
SRV 0 5 7577 12180710.fsn1-dc14.hetzner
_gitea._tcp.routinginfo SRV 0 5 7570 12180711.fsn1-dc14.hetzner

4
data/bindzone/redxen.eu
View File

@ -90,8 +90,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 "lID9gS7wg8_Q0dCVAKs_6y13yfNhKAtB4GBmyotI6sY"
_acme-challenge 300 TXT "VX-1hQa7CJSJJuApB_aIL79mhkgLw8MUb3ObtiJJLiU"
_acme-challenge 300 TXT "o5XmJLpB9ZhkdcU89_YQyYqa06aB3ZB0T4n_9OhCJ5k"
_acme-challenge 300 TXT "jiFis3iTRECZXU1XmldIgPs5Y_o57JAknkllff9muXo"
; Autodiscovery
_mumble._tcp SRV 0 5 64738 12180623.nbg1-dc3.hetzner

31
openrc/gost/APKBUILD Normal file
View File

@ -0,0 +1,31 @@
# Contributor: Alex Denes <caskd@redxen.eu>
# Maintainer: Alex Denes <caskd@redxen.eu>
. ../APKBUILD-openrc.template
pkgver=2023.05.24.03
pkgrel=0
source="$source secret"
depends="openrc $_rx_pkgname"
prepare() {
default_prepare
cp conffile conffile-mod
}
build() {
. secret
rx_replace "AUTH_CREDS" "${AUTH_CREDS:?'Missing auth key'}" "conffile-mod"
}
package() {
rx_openrc_runlevel_add
rx_openrc_runfile_install
rx_openrc_conffile_install "conffile-mod"
}
sha512sums="
dbbd5ac20c80afaded42cd78a0a789b117d36bdd2b4deee3e575748ee25be29dc117eb544c997deed388f17989f1754f61c958a79c5e826b2c752cbb7e07b0b0 runfile
d2e754ce04dd1aa8f642ef68cbcd621cf602acee438f0b969339c8db5d403fe7c4b8ced85aa07b005ead4477337dc4f8ae8e362f2c2d2998d8c7b6128bc99eee conffile
b9be5588e9ae46cf7aa262511e6bec573a1ab103e3bfa3625c29338ed11377936a65b98daf88a0c269a605e68bbec4d31ff03a41df2b70b12604bb8f058b1426 secret
"

1
openrc/gost/conffile Normal file
View File

@ -0,0 +1 @@
command_args='-L "relay+ws://AUTH_CREDS@:7591?bind=true"'

10
openrc/gost/runfile Normal file
View File

@ -0,0 +1,10 @@
#!/sbin/openrc-run
supervisor=supervise-daemon
command="/usr/bin/gost"
command_background="yes"
depend() {
need net
after firewall
}

4
secret/letsencrypt/APKBUILD
View File

@ -3,7 +3,7 @@
. ../APKBUILD-secret.template
pkgver=2023.02.07.01
pkgver=2023.05.08.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
51847c98ea43c37ce36c497a687c246cf8a8a0b1b075ee2aa471a1d29cd0b08d1d63bc74a212993e6eb7410a9e3e6c4d3ab25d2c014107fda269496fff8eb974 public.pem
f71d27718d4d787bf25ef8dd3f14e6db93676cbce30848e7612e4812a71b4a67076bf2052aae9af9c841d2a1a86ea90ba9d18c7acee587b57ec5a93ac2e0a565 public.pem
6193ff52acda2b57fcf8b4881e93bf451577b77068f5e027fd8ccb7cea1e283e084e97bc7c33056eabc46dc1af903e865919c9da2789f2ae644ec2993ac74e0a ca.pem
"

30
secret/letsencrypt/public.pem
View File

@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
MIIFJDCCBAygAwIBAgISA/qfYEXnk4AyR7jC0mv88zV2MA0GCSqGSIb3DQEBCwUA
MIIFJTCCBA2gAwIBAgISBIByJoxAVqrTVv8V7ZQQu+TSMA0GCSqGSIb3DQEBCwUA
MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
EwJSMzAeFw0yMzAyMDcwOTM2MjRaFw0yMzA1MDgwOTM2MjNaMBQxEjAQBgNVBAMT
EwJSMzAeFw0yMzA1MDgxMDU4MTlaFw0yMzA4MDYxMDU4MThaMBQxEjAQBgNVBAMT
CXJlZHhlbi5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeD0yl2
aQaIK73GpBOA1JpdesESlCvjEw9g84uN8Yk4fG77wGcDZw1Ja4vrj9MBmzvnLMUe
j5mizZP2L3eIgx3KKsuIT4hClGSR/oeN0cL93RUYAwZqW1q8NBuAxu1QPhXn82ZK
8qLnlZGJQBvRy2rCAru26QjgeJHt7P9jdDpq0KolT3Nlt+gmO/oJJiZUcfvUWJ+K
D0cX7BQy+GFH4XSAWSMB1w+HhLaKUESaBfSvAuX6awUu1JfbJW0yUoG+We9/RuMI
44TDLGfVujmpRYgcOlJRBQiSXi/pMie1kdQqev0uFYRCSuM6QTkHlPYRrPXHPZks
vmqRDe1do7TgnFkCAwEAAaOCAlAwggJMMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
vmqRDe1do7TgnFkCAwEAAaOCAlEwggJNMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU
PIwzPDkx1+DgEji18Q8rc+Y0dXAwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA5h+v
nYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMuby5s
ZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8wIQYD
VR0RBBowGIILKi5yZWR4ZW4uZXWCCXJlZHhlbi5ldTBMBgNVHSAERTBDMAgGBmeB
DAECATA3BgsrBgEEAYLfEwEBATAoMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxl
dHNlbmNyeXB0Lm9yZzCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AHoyjFTYty22
IOo44FIe6YQWcDIThU070ivBOlejUutSAAABhityuLEAAAQDAEcwRQIgLMwoPp69
jsyUlTEtupvnlON8p61yzh3Mz6WvhE4ZiUICIQD3eYTScuh0NvRcqs6nl3fczVOw
ctYClCNcPtQSdD6zjAB1AK33vvp8/xDIi509nB4+GGq0Zyldz7EMJMqFhjTr3IKK
AAABhityuM8AAAQDAEYwRAIgK9x63XTgzKC9vsjzN/GFXM87TBedSypOQujthltm
NRkCIDLvaTu5+L2MzP3y/ksdbakQikmoWn3kE8iZkYYTNv5NMA0GCSqGSIb3DQEB
CwUAA4IBAQBsw/2+kg35llcJOBC3QY+mjYPN2LjKKHgmESUofrR0u1SncY9Nd94L
y3c2PP9QHyWQnI0vrPTk9G68IKqUeSSvnP4wLfZVTkg9UFQTfz8TBYKKAHP9f6q1
9PzuvYKjtsIhxyQg7S8r5w6/OiVd4kMfaFg4izE6olPUkfiRZxIfy737EsKLgzWW
Y/JR9W2mq1KGDnedtfQCBuJVh9GMmTefe0t2/qoxVdWoNFB23wNpqYbrGSmN3p9V
5cz4Td8A4Pr4VlJBT1LOjxplhgjj3p8D4TFn0BuTwQX1aQcNaQAO/WdVvv2Ds+nV
s4JEj+9/NQvKQPk2cWqgCl4SvG9VMgPm
dHNlbmNyeXB0Lm9yZzCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB1AHoyjFTYty22
IOo44FIe6YQWcDIThU070ivBOlejUutSAAABh/s6ElQAAAQDAEYwRAIgWi4uf7JP
Odh1PvAXJe8dgLG7jHvQn3j9v9zeu/9OFCUCIDenjOsxgyqB/7ok7ptEHbVbtH+b
in4WnrddVYuxymbBAHcArfe++nz/EMiLnT2cHj4YarRnKV3PsQwkyoWGNOvcgooA
AAGH+zoSbwAABAMASDBGAiEA9JAhCzLDKTK6exwyTpJiZ/fJk6qrTKpS3e3sQkMD
9OsCIQDRVFi1axsrUAzcvVeWfW7W2R4iSt0F6VG9guyBMOkzejANBgkqhkiG9w0B
AQsFAAOCAQEAm4Xkv2CTLgyCq65Dzf7desENfiavtH8y6S7Ftc0PVj++kqhE7u7N
pl6cXixY9+lFziMPEPgJAu4k2WoyrkGjPGfBZwf0xFbT6yTGQTTTDGA2KS6GtX9g
9r1ew/ExlDy32lljpoYEY/kafSjCv1DEixRF91lwaNuwaI/mwKbbSPUcs/ZO0126
oi0uS1UFY6/XXMyV9rUUCP6YmHyaXFGIgOZR1B8pe8jebO8OVIj2E1bEvRMwD3LZ
CtwjOx/rFhfvJl8S7odI2eRvn/wVUml1Hy+sq4oKMIfIq8orsOhe7qrjzAQg9CWA
oDFRPjPkIfOBqd0VyqSqfvFx44IHm8W9vw==
-----END CERTIFICATE-----