kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests Releases Activity

move some stuff from rx300 to carlene

Browse source
This commit is contained in:
Franzi 2023-09-03 18:25:48 +02:00
parent 9dacd4a14b
commit 7e335cc3ae
Signed by: kunsi
GPG key ID: 12E3D2136B818350
2 changed files with 26 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
nodes/carlene.toml
View file

@ -29,11 +29,6 @@ bundles = [
"zfs",
]
[metadata.backups]
paths = [
"/var/www/paste.franzi.business/",
]
[metadata.check-mail-received.t-online]
email = "franzi.kunsmann@t-online.de"
imap_host = "secureimap.t-online.de"
@ -91,7 +86,7 @@ baseurl = "matrix.franzi.business"
server_name = "franzi.business"
trusted_key_servers = ["matrix.org", "finallycoffee.eu"]
additional_client_config.'im.vector.riot.jitsi'.preferredDomain = "meet.ffmuc.net"
# wellknown_also_on_vhosts = ["franzi.business"]
wellknown_also_on_vhosts = ["franzi.business"]
[metadata.mautrix-telegram]
version = "v0.14.1"
@ -131,9 +126,34 @@ domain = "warnochwas.de"
contact = "mailto:security@kunsmann.eu"
Encryption = "https://franzi.business/gpg_hi-kunsmann.eu.asc"
[metadata.nginx.vhosts.'franzi.business']
domain = "franzi.business"
[metadata.nginx.vhosts.'gaenseblum.eu'.webroot_config]
owner = "skye"
[metadata.nginx.vhosts.mta-sts]
domain = "mta-sts.kunbox.net"
domain_aliases = [
"mta-sts.franzi.business",
"mta-sts.kunsmann.eu",
]
[metadata.nginx.vhosts.redirector]
domain = "kunbox.net"
domain_aliases = [
"carlene.kunbox.net",
"kunsmann.eu",
]
[metadata.nginx.vhosts.redirector.locations.'/']
redirect = "https://franzi.business/"
[metadata.nginx.vhosts.redirector.locations.'/.well-known/openpgpkey/']
alias = "/var/www/franzi.business/.well-known/openpgpkey"
additional_config = [
"add_header Access-Control-Allow-Origin *",
"default_type application/octet-stream",
]
[metadata.ntfy]
domain = "ntfy.franzi.business"
ratelimit-exempt-hosts = [
@ -239,9 +259,6 @@ type = "mirror"
[metadata.zfs.datasets.tank]
primarycache = "metadata"
[metadata.zfs.datasets.'tank/kunsi/webdump']
mountpoint = "/var/www/paste.franzi.business"
[metadata.vm]
cpu = 24
ram = 64

71
nodes/rx300.py
View file

@ -101,36 +101,6 @@ nodes['rx300'] = {
},
},
},
'franzi.business': {
'webroot': '/var/www/franzi.business/_site/',
'ssl': '_.franzi.business',
'extras': True,
"locations": {
"/.well-known/matrix/client": {
"additional_config": [
"add_header Access-Control-Allow-Origin *",
"default_type application/json"
],
"content": "{\"im.vector.riot.jitsi\": {\"preferredDomain\": \"meet.ffmuc.net\"}, \"m.homeserver\": {\"base_url\": \"https://matrix.franzi.business\"}, \"m.identity_server\": {\"base_url\": \"https://matrix.org\"}}",
"return": 200
},
"/.well-known/matrix/server": {
"additional_config": [
"add_header Access-Control-Allow-Origin *",
"default_type application/json"
],
"content": "{\"m.server\": \"matrix.franzi.business:443\"}",
"return": 200
}
},
},
'git.kunsmann.eu': {
'locations': {
'/': {
'redirect': 'https://git.franzi.business$request_uri',
},
},
},
'jugendhackt_tools': {
'domain': 'jh.franzi.business',
'ssl': '_.franzi.business',
@ -143,47 +113,6 @@ nodes['rx300'] = {
},
},
},
'kunbox.net': {},
'kunsmann.eu': {
'locations': {
'/': {
'redirect': 'https://franzi.business$request_uri',
},
'/.well-known/openpgpkey': {
'alias': '/var/www/kunsmann.eu/.well-known/openpgpkey/',
'additional_config': {
'default_type application/octet-stream',
'add_header Access-Control-Allow-Origin *',
},
},
},
},
'mta-sts': {
'domain': 'mta-sts.kunbox.net',
'domain_aliases': {
'mta-sts.franzi.business',
'mta-sts.kunsmann.eu',
'mta-sts.trans-agenda.eu',
},
},
'paste.franzi.business': {
'ssl': '_.franzi.business',
'extras': True,
'webroot_config': {
'owner': 'kunsi',
},
},
'wiki.franzi.business': {
'ssl': '_.franzi.business',
'extras': True,
'php': True,
'webroot_config': {
'owner': 'www-data',
'group': 'www-data',
},
'website_check_path': '/start?do=login',
'website_check_string': 'Username',
},
},
'worker_processes': 8,
},