Compare commits

..

2 Commits

Author SHA1 Message Date
Pizza1
90572b16f8 update knoti 2023-07-30 01:29:04 -07:00
Pizza1
e91228cf6f make longer timeouts def 2023-06-27 11:55:38 -07:00
8 changed files with 116 additions and 47 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash
RSYNC_ARGS='--recursive --copy-links --copy-dirlinks --perms --xattrs --times --delete --verbose --compress --compress-choice=zstd --mkpath --cvs-exclude --human-readable --partial --progress'
# India Node
rsync --rsh='ssh -p6922' ${RSYNC_ARGS} /var/cdn/ cdn@in.projectsegfau.lt:/var/cdn
rsync ${RSYNC_ARGS} /var/cdn/ cdn@in.vpn.projectsegfau.lt:/var/cdn
# US Node
rsync ${RSYNC_ARGS} /var/cdn/ cdn@us.projectsegfau.lt:/var/cdn
rsync ${RSYNC_ARGS} /var/cdn/ cdn@us.vpn.projectsegfau.lt:/var/cdn

View File

@ -12,9 +12,10 @@ defaults
mode http
option httplog
option dontlognull
timeout connect 5000
timeout client 50000
timeout server 50000
timeout connect 3600000
timeout client 3600000
timeout server 3600000
timeout tunnel 3600000
listen ssh
bind :::22 v4v6
balance roundrobin
@ -40,10 +41,6 @@ listen soju
mode tcp
option tcp-check
server pubnix 10.7.0.2:6697 check inter 10s fall 2 rise 1
timeout connect 3600000
timeout client 3600000
timeout server 3600000
timeout tunnel 3600000
listen iperf3
bind :::5202 v4v6
balance roundrobin

View File

@ -1,16 +1,4 @@
REPLACEME:
- geo: "*;*;*"
A: 107.189.12.96
AAAA: 2605:6400:30:f79f:9e20:f366:f052:5a25
TXT: "Worldwide-BuyVM-Lux"
- geo: "EU;*;*"
A: 107.189.12.96
TXT: "Europe-BuyVM-Lux"
AAAA: 2605:6400:30:f79f:9e20:f366:f052:5a25
- geo: "AF;*;*"
A: 107.189.12.96
AAAA: 2605:6400:30:f79f:9e20:f366:f052:5a25
TXT: "Africa-BuyVM-Lux"
- geo: "NA;*;*"
A: 143.198.131.196
AAAA: 2604:a880:4:1d0::52:7000
@ -23,6 +11,6 @@ REPLACEME:
A: 143.198.131.196
AAAA: 2604:a880:4:1d0::52:7000
TXT: "Oceania-DigitalOcean-SanFrancisco"
- geo: "AS;*;*"
- geo: "AS;*;*"
A: 110.227.202.171
TXT: "Asia-Airtel-Ind"
TXT: "Asia-Airtel-Ind"

View File

@ -1,11 +1,25 @@
#!/usr/bin/env bash
remote='cdn@us.vpn.projectsegfau.lt'
geoconf=/etc/knot/geo.conf
remote='cdn@us'
domainsfile=/var/geodnsdomains
soltemplate=/configs/knot/soltemplate
pizzatemplate=/configs/knot/pizzatemplate
restemplate=/configs/knot/geodnstemplate
printf '' > $geoconf
for i in $(</var/geodnsdomains); do
cat /etc/knot/geodnstemplate >> $geoconf
sed -i "s/REPLACEME/${i}/" $geoconf
for i in $(<$domainsfile); do
cat $restemplate >> $geoconf
while IFS=, read -r dom ser; do
domain=$dom
server=$ser
done < <(echo ${i})
if [[ $server == "pizza1" ]]; then
cat $pizzatemplate >> $geoconf
elif [[ $server == "soleil" ]]; then
cat $soltemplate >> $geoconf
fi
sed -i "s/REPLACEME/${domain}/" $geoconf
done
scp $geoconf "${remote}":/var/geo.conf
ssh $remote "sudo systemctl restart knot"
systemctl restart knot

13
knot/pizzatemplate Normal file
View File

@ -0,0 +1,13 @@
- geo: "*;*;*"
A: 107.189.12.96
AAAA: 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
TXT: "Worldwide-BuyVM-Lux"
- geo: "EU;*;*"
A: 107.189.12.96
TXT: "Europe-BuyVM-Lux"
AAAA: 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
- geo: "AF;*;*"
A: 107.189.12.96
AAAA: 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
TXT: "Africa-BuyVM-Lux"

10
knot/soltemplate Normal file
View File

@ -0,0 +1,10 @@
- geo: "*;*;*"
A: 92.148.60.159
TXT: "Worldwide-Soleil-Lille"
- geo: "EU;*;*"
A: 92.148.60.159
TXT: "Europe-Soleil-Lille"
- geo: "AF;*;*"
A: 92.148.60.159
TXT: "Africa-Soleil-Lille"

View File

@ -21,19 +21,21 @@ pizza1 A 107.189.12.96
pizza A 107.189.12.96
*.eu A 107.189.12.96
*.bp A 107.189.12.96
pizza1 AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
pizza AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
*.eu AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
*.bp AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
pizza1 AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
pizza AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
*.eu AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
*.bp AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
*.p.projectsegfau.lt. A 107.189.12.96
p.projectsegfau.lt. A 107.189.12.96
*.p.projectsegfau.lt. AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
p.projectsegfau.lt. AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
*.p.projectsegfau.lt. AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
p.projectsegfau.lt. AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
geminiproxy CNAME pizza.projectsegfau.lt.
ferrit.projectsegfau.lt. CNAME pizza.projectsegfau.lt.
proxy.lbry.projectsegfau.lt. CNAME pizza.projectsegfau.lt.
arya.projectsegfau.lt. CNAME pizza.projectsegfau.lt.
gothub.dev.projectsegfau.lt. CNAME pizza.projectsegfau.lt.
bb.projectsegfau.lt. CNAME pizza.projectsegfau.lt.
bb.in.projectsegfau.lt. CNAME pizza.projectsegfau.lt.
bb.us.projectsegfau.lt. CNAME pizza.projectsegfau.lt.
; Soleil Levant
* A 92.148.60.159
@ -47,12 +49,23 @@ _xmpp-server._tcp SRV 10 0 5269 xmpp.projectsegfau.lt.
_xmpps-client._tcp SRV 10 0 5223 xmpp.projectsegfau.lt.
_xmpps-server._tcp SRV 10 0 5270 xmpp.projectsegfau.lt.
_of._tcp.of.projectsegfau.lt SRV 5 0 27015 of.projectsegfau.lt.
anonymousoverflow.eu CNAME soleil.projectsegfau.lt.
bw.eu CNAME soleil.projectsegfau.lt.
gothub.eu CNAME soleil.projectsegfau.lt.
hyperpipe.eu CNAME soleil.projectsegfau.lt.
hyperpipebackend.eu CNAME soleil.projectsegfau.lt.
rimgo.eu CNAME soleil.projectsegfau.lt.
safetwitch.eu CNAME soleil.projectsegfau.lt.
api.safetwitch.eu CNAME soleil.projectsegfau.lt.
scribe.eu CNAME soleil.projectsegfau.lt.
translate.eu CNAME soleil.projectsegfau.lt.
gothub.dev.projectsegfau.lt. CNAME soleil.projectsegfau.lt.
; US Node
*.us A 143.198.131.196
us A 143.198.131.196
*.us AAAA 2604:a880:4:1d0::52:7003
us AAAA 2604:a880:4:1d0::52:7003
*.us AAAA 2604:a880:4:1d0::52:7000
us AAAA 2604:a880:4:1d0::52:7000
; IN Node
in A 110.227.202.171
@ -66,6 +79,20 @@ hole AAAA 2001:41d0:404:200::5149
status AAAA 2001:41d0:404:200::5149
wg AAAA 2001:41d0:404:200::5149
; Tailscale
*.vpn A 100.64.0.6
core.vpn A 100.64.0.11
db.vpn A 100.64.0.12
docker.vpn A 100.64.0.13
lxc.vpn A 100.64.0.15
backwards.vpn A 100.64.0.6
us.vpn A 100.64.0.3
in.vpn A 100.64.0.5
pizza1.vpn A 100.64.0.8
pizza.vpn A 100.64.0.8
status.vpn A 100.64.0.9
sol.vpn A 100.64.0.16
; Mail Stuff
mail.projectsegfau.lt. A 92.148.60.159
feb2023._domainkey IN TXT "v=DKIM1;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+gF5p8pTKZMPe4rDdsDTedelOTeIcEYzy5Fd1b3Tv0gWTOkk7Lx+opIY0lUU9k+K+UbPJ4asUT6zrdZusXrp85g36Rh8+lZbZWr6mqE/GJjIh9kIvXRWasHZpcnws2Ex2Mc2tefJ9FtFntpoX/v0zR2Wr8wiztZrHL23VaY+7kLgPe4PC0CM4tLyuuraC0AYVjI/yCvo8XZkb7kvOfi+EpThN3B91zSGVnZXPJdtQdE/JJ2psthhRilHBwo1Rs+PsFNFvi1chHPP44z2JPS7OyALR+ycDvXz2Hj6WS8s9pcXk7NPi0sLY+h+5Ha6KoDa4sjBmmEN07U+hE+2/rE9IQIDAQAB"
@ -84,9 +111,6 @@ _25._tcp.mail.projectsegfau.lt. 86400 IN TLSA 2 1 1 0b9fa5a59eed715c26c1020c711b
projectsegfau.lt. MX 10 mail.projectsegfau.lt.
p.projectsegfau.lt. TXT "buyvm-validation=b6444ab72efafcdef664a693ce2ba26ebd03ed1c7377cd08926db831e94a3d5a"
projectsegfau.lt A 107.189.12.96
projectsegfau.lt AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
; Simplelogin
sl A 51.91.103.130
sl AAAA 2001:41d0:404:200::5149
@ -100,6 +124,7 @@ sl TXT "v=spf1 ip4:51.91.103.130 ~all"
@ TXT "oa1:ltc recipient_address=ltc1qn3ald586h2ntt0n3zkvwsmju2e5vndgtvvgatj; recipient_name=Project Segfault; tx_description=Donate to Project Segfault"
@ TXT "oa1:xmr recipient_address=47L7Qsto7XcifY3CdG18ySe5Tt83kpFLDLve9jQwbc9taPBLNGv6ZrJNUKpMG9Nj9zHgCZ4FQMSyt75e8Jvx12JFLtJyFdA; recipient_name=Project Segfault; tx_description=Donate to Project Segfault"
_token._dnswl.projectsegfau.lt. IN TXT "1q5i422gbg9qqlekp8zag8scwwb7oicd"
@ TXT "google-site-verification=eVdjDx83PnuTLvCOpugzjKt4IRW1GvMr72MPjLQXau4"
; PTR(s)
159.60.148.92.in-addr.arpa. PTR mail.projectsegfau.lt.
171.202.227.110.in-addr.arpa. PTR in.projectsegfau.lt.

View File

@ -17,14 +17,14 @@ pizza1 A 107.189.12.96
pizza A 107.189.12.96
*.eu A 107.189.12.96
*.bp A 107.189.12.96
pizza1 AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
pizza AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
*.eu AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
*.bp AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
pizza1 AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
pizza AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
*.eu AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
*.bp AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
*.p A 107.189.12.96
p A 107.189.12.96
*.p AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
p AAAA 2605:6400:30:f79f:9e20:f366:f052:5a25
*.p AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
p AAAA 2605:6400:30:f79f:e3e9:15cf:5b61:c4ee
gp CNAME pizza.psf.lt.
; Soleil Levant
@ -35,12 +35,20 @@ auth.p A 92.148.60.159
;_of._tcp.of.psf.lt SRV 5 0 27015 of.psf.lt.
s A 92.148.60.159
_s._tcp.s.psf.lt SRV 5 0 27015 s.psf.lt.
o.eu CNAME s.psf.lt.
bw.eu CNAME s.psf.lt.
gh.eu CNAME s.psf.lt.
hp.eu CNAME s.psf.lt.
rg.eu CNAME s.psf.lt.
tw.eu CNAME s.psf.lt.
sc.eu CNAME s.psf.lt.
tl.eu CNAME s.psf.lt.
; US Node
*.us A 143.198.131.196
us A 143.198.131.196
*.us AAAA 2604:a880:4:1d0::52:7003
us AAAA 2604:a880:4:1d0::52:7003
*.us AAAA 2604:a880:4:1d0::52:7000
us AAAA 2604:a880:4:1d0::52:7000
; IN Node
in A 110.227.202.171
@ -55,6 +63,20 @@ hole AAAA 2001:41d0:404:200::5149
st AAAA 2001:41d0:404:200::5149
wg AAAA 2001:41d0:404:200::5149
; Tailscale
*.v A 100.64.0.6
core.v A 100.64.0.11
db.v A 100.64.0.12
docker.v A 100.64.0.13
lxc.v A 100.64.0.15
backwards.v A 100.64.0.6
us.v A 100.64.0.3
in.v A 100.64.0.5
pizza1.v A 100.64.0.8
pizza.v A 100.64.0.8
status.v A 100.64.0.9
sol.v A 100.64.0.16
; Simplelogin
sl A 51.91.103.130
sl AAAA 2001:41d0:404:200::5149