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

bundles/nginx: rename 'proxy' metadata to 'locations', support more generic options, move extras files to metadata
All checks were successful
bundlewrap/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Franzi 2021-07-04 19:27:12 +02:00
parent a3a228fc2d
commit b5ab21549d
Signed by: kunsi
GPG key ID: 12E3D2136B818350
25 changed files with 164 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nodes/gce/bind01.py
View file

@ -28,7 +28,7 @@ nodes['gce.bind01'] = {
'nginx': {
'vhosts': {
'ns-1.kunbox.net': {
'proxy': {
'locations': {
'/': {
'target': 'http://127.0.0.1:8000/',
},

2
nodes/home/paperless-sophie.py
View file

@ -51,7 +51,7 @@ nodes['home.paperless-sophie'] = {
'paperless': {
'domain': 'paperless-sophie.home.kunbox.net',
'ssl': '_.home.kunbox.net',
'proxy': {
'locations': {
'/': {
'target': 'http://127.0.0.1:22070',
'websockets': True,

6
nodes/home/paperless.py
View file

@ -40,7 +40,7 @@ nodes['home.paperless'] = {
'paperless': {
'domain': 'paperless.home.kunbox.net',
'ssl': '_.home.kunbox.net',
'proxy': {
'locations': {
'/': {
'target': 'http://127.0.0.1:22070',
'websockets': True,
@ -48,8 +48,10 @@ nodes['home.paperless'] = {
'X-Forwarded-Host': '$server_name',
},
},
'/static/': {
'alias': '/opt/paperless/static/',
},
},
'extras': True,
'max_body_size': '100M',
},
},

2
nodes/htz-cloud/influxdb.py
View file

@ -42,7 +42,7 @@ nodes['htz-cloud.influxdb'] = {
'vhosts': {
'influxdb': {
'domain': 'influxdb.kunsmann.eu',
'proxy': {
'locations': {
'/': {
'target': 'http://localhost:8086',
'websockets': True,

2
nodes/htz-cloud/miniserver.py
View file

@ -160,7 +160,7 @@ nodes['htz-cloud.miniserver'] = {
# 'extras': True,
# 'do_not_set_content_security_headers': True,
# 'max_body_size': '50M',
# 'proxy': {
# 'locations': {
# '/': {
# 'target': 'http://127.0.0.1:8184',
# },

6
nodes/htz-cloud/pleroma.py
View file

@ -44,7 +44,11 @@ nodes['htz-cloud.pleroma'] = {
},
'pleroma-www-redir': {
'domain': 'www.cybert-media.net',
'extras': True,
'locations': {
'/': {
'redirect': 'https://cybert-media.net$request_uri',
},
},
},
},
},

112
nodes/htz/ex42-1048908.py
View file

@ -261,18 +261,35 @@ nodes['htz.ex42-1048908'] = {
'vhosts': {
# TODO maybe some of this can be moved to a bundle?
'dav.kunsmann.eu': {
'extras': True,
'locations': {
'/': {
'target': 'http://[::1]:22050',
'auth': {
'file': '/etc/radicale/htpasswd',
},
'proxy_set_header': {
'X-Remote-User': '$remote_user',
},
},
'/.web/': {
'target': 'http://[::1]:22050',
}
},
},
'daskritzelt-redirect': {
'domain': 'die-brontosaurier-waren-es.org',
'ssl': False, # TODO enable ssl once domain transfer is done
'extras': True,
'ssl': None,
'locations': {
'/': {
'redirect': 'https://twitter.com/daskritzelt/status/1259167444373028864',
},
},
},
'dimension.franzi.business': {
'extras': True,
'do_not_set_content_security_headers': True,
'max_body_size': '50M',
'proxy': {
'locations': {
'/': {
'target': 'http://127.0.0.1:8184',
},
@ -280,10 +297,37 @@ nodes['htz.ex42-1048908'] = {
},
'franzi.business': {
'webroot': '/var/www/franzi.business/_site/',
'extras': True,
'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': 'https://matrix.franzi.business',
}, sort_keys=True),
'additional_config': {
'default_type application/json',
'add_header Access-Control-Allow-Origin *',
},
},
},
},
'jenkins.kunsmann.eu': {
'proxy': {
'locations': {
'/': {
'target': 'http://localhost:22010/',
},
@ -293,10 +337,58 @@ nodes['htz.ex42-1048908'] = {
},
'kunbox.net': {},
'kunsmann.eu': {
'extras': True,
'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 *',
},
},
},
},
'matrix.franzi.business': {
'extras': True,
'locations': {
'/_matrix': {
'target': 'http://[::1]:20080',
},
'/_matrix/media': {
'target': 'http://localhost:20090',
'client_max_body_size': '500M',
},
'/_synapse': {
'target': 'http://[::1]:20080',
},
'/.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': 'https://matrix.franzi.business',
}, sort_keys=True),
'additional_config': {
'default_type application/json',
'add_header Access-Control-Allow-Origin *',
},
},
},
},
'mta-sts': {
'domain': 'mta-sts.mx0.kunbox.net',
@ -322,14 +414,14 @@ nodes['htz.ex42-1048908'] = {
'website_check_string': 'login',
},
'rspamd.mx0.kunbox.net': {
'proxy': {
'locations': {
'/': {
'target': 'http://localhost:11334/',
},
},
},
# 'travelynx.franzi.business': {
# 'proxy': {
# 'locations': {
# '/': {
# 'target': 'http://127.0.0.1:22020',
# },

2
nodes/ovh/icinga2.py
View file

@ -79,7 +79,7 @@ nodes['ovh.icinga2'] = {
},
'icinga_statusmonitor': {
'domain': 'statusmonitor.icinga.kunsmann.eu',
'proxy': {
'locations': {
'/': {
'target': 'http://127.0.0.1:5000/',
}

9
nodes/rx300.py
View file

@ -66,12 +66,17 @@ nodes['rx300'] = {
'travelynx': {
'domain': 'travelynx.franzi.business',
'ssl': '_.franzi.business',
'proxy': {
'locations': {
'/': {
'target': 'http://127.0.0.1:22020',
},
'/static': {
'root': '/opt/travelynx/public',
},
'/service-worker.js': {
'root': '/opt/travelynx/public',
},
},
'extras': True,
},
},
},