move franzi.business to rx300

This commit is contained in:
Franzi 2021-07-09 16:11:53 +02:00
parent c2cb5a2546
commit bd77f8da93
Signed by: kunsi
GPG key ID: 12E3D2136B818350
3 changed files with 66 additions and 33 deletions

View file

@ -2,8 +2,9 @@ ${header}
$ORIGIN franzi.business. $ORIGIN franzi.business.
@ IN A 94.130.52.224 ; ends up on rx300.kunbox.net
IN AAAA 2a01:4f8:10b:2a5f::2 @ IN A 31.47.232.106
IN AAAA 2a00:f820:528::2
IN MX 10 mx0.kunbox.net. IN MX 10 mx0.kunbox.net.
IN TXT "v=spf1 mx ~all" IN TXT "v=spf1 mx ~all"

View file

@ -295,37 +295,37 @@ nodes['htz.ex42-1048908'] = {
}, },
}, },
}, },
'franzi.business': { # 'franzi.business': {
'webroot': '/var/www/franzi.business/_site/', # 'webroot': '/var/www/franzi.business/_site/',
'locations': { # 'locations': {
'/.well-known/matrix/client': { # '/.well-known/matrix/client': {
'return': json_dumps({ # 'return': json_dumps({
'm.homeserver': { # 'm.homeserver': {
'base_url': 'https://matrix.franzi.business', # 'base_url': 'https://matrix.franzi.business',
}, # },
'm.identity_server': { # 'm.identity_server': {
'base_url': 'https://matrix.org', # 'base_url': 'https://matrix.org',
}, # },
'im.vector.riot.jitsi': { # 'im.vector.riot.jitsi': {
'preferredDomain': 'meet.ffmuc.net', # 'preferredDomain': 'meet.ffmuc.net',
}, # },
}, sort_keys=True), # }, sort_keys=True),
'additional_config': { # 'additional_config': {
'default_type application/json', # 'default_type application/json',
'add_header Access-Control-Allow-Origin *', # 'add_header Access-Control-Allow-Origin *',
}, # },
}, # },
'/.well-known/matrix/server': { # '/.well-known/matrix/server': {
'return': json_dumps({ # 'return': json_dumps({
'm.server': 'matrix.franzi.business:443', # 'm.server': 'matrix.franzi.business:443',
}, sort_keys=True), # }, sort_keys=True),
'additional_config': { # 'additional_config': {
'default_type application/json', # 'default_type application/json',
'add_header Access-Control-Allow-Origin *', # 'add_header Access-Control-Allow-Origin *',
}, # },
}, # },
}, # },
}, # },
'jenkins.kunsmann.eu': { 'jenkins.kunsmann.eu': {
'locations': { 'locations': {
'/': { '/': {

View file

@ -80,6 +80,38 @@ nodes['rx300'] = {
'vhosts': { 'vhosts': {
'gitea': {'ssl': '_.franzi.business'}, 'gitea': {'ssl': '_.franzi.business'},
'miniflux': {'ssl': '_.franzi.business'}, 'miniflux': {'ssl': '_.franzi.business'},
'franzi.business': {
'webroot': '/var/www/franzi.business/_site/',
'ssl': '_.franzi.business',
'locations': {
'/.well-known/matrix/client': {
'return': json_dumps({
'm.homeserver': {
'base_url': 'https://matrix.franzi.business',
},
'm.identity_server': {
'base_url': 'https://matrix.org',
},
'im.vector.riot.jitsi': {
'preferredDomain': 'meet.ffmuc.net',
},
}, sort_keys=True),
'additional_config': {
'default_type application/json',
'add_header Access-Control-Allow-Origin *',
},
},
'/.well-known/matrix/server': {
'return': json_dumps({
'm.server': 'matrix.franzi.business:443',
}, sort_keys=True),
'additional_config': {
'default_type application/json',
'add_header Access-Control-Allow-Origin *',
},
},
},
},
'unicornsden': { 'unicornsden': {
'domain': 'unicornsden.franzi.business', 'domain': 'unicornsden.franzi.business',
'ssl': '_.franzi.business', 'ssl': '_.franzi.business',