kunsi
/
bundlewrap
1
0
Fork 0
Code Issues 2 Pull Requests 1 Releases Activity

have more bundles provide nginx metadata for themselves

This commit is contained in:
Franzi 2021-07-16 14:20:01 +02:00
parent 2ca14d0f62
commit 6022bac0ef
Signed by: kunsi
GPG Key ID: 12E3D2136B818350
6 changed files with 63 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/element-web/metadata.py
View File

@ -12,7 +12,7 @@ defaults = {
}
@metadata_reactor.provides(
'nginx/vhosts',
'nginx/vhosts/element-web',
)
def nginx_config(metadata):
return {

2
bundles/gitea/metadata.py
View File

@ -66,7 +66,7 @@ defaults = {
@metadata_reactor.provides(
'nginx/vhosts',
'nginx/vhosts/gitea',
)
def nginx(metadata):
if not node.has_bundle('nginx'):

25
bundles/jenkins-ci/metadata.py
View File

@ -32,3 +32,28 @@ defaults = {
},
},
}
@metadata_reactor.provides(
'nginx/vhosts/jenkins-ci',
)
def nginx(metadata):
if not node.has_bundle('nginx'):
raise DoNotRunAgain
return {
'nginx': {
'vhosts': {
'jenkins-ci': {
'domain': metadata.get('jenkins-ci/domain'),
'locations': {
'/': {
'target': 'http://localhost:22010/',
},
},
'website_check_path': '/login',
'website_check_string': 'Welcome to Jenkins',
},
},
},
}

2
bundles/miniflux/metadata.py
View File

@ -36,7 +36,7 @@ defaults = {
@metadata_reactor.provides(
'nginx/vhosts',
'nginx/vhosts/miniflux',
)
def nginx(metadata):
if not node.has_bundle('nginx'):

31
bundles/travelynx/metadata.py
View File

@ -23,3 +23,34 @@ defaults = {
},
},
}
@metadata_reactor.provides(
'nginx/vhosts/travelynx',
)
def nginx(metadata):
if not node.has_bundle('nginx'):
raise DoNotRunAgain
return {
'nginx': {
'vhosts': {
'travelynx': {
'domain': metadata.get('travelynx/domain'),
'locations': {
'/': {
'target': 'http://127.0.0.1:22020',
},
'/static': {
'root': '/opt/travelynx/public',
},
'/service-worker.js': {
'root': '/opt/travelynx/public',
},
},
'website_check_path': '/login',
'website_check_string': 'travelynx',
},
},
},
}

30
nodes/rx300.py
View File

@ -115,6 +115,7 @@ nodes['rx300'] = {
},
'jenkins-ci': {
'install_ssh_key': True,
'domain': 'jenkins.franzi.business',
},
'miniflux': {
'domain': 'rss.franzi.business',
@ -123,7 +124,9 @@ nodes['rx300'] = {
'vhosts': {
'element-web': {'ssl': '_.franzi.business'},
'gitea': {'ssl': '_.franzi.business'},
'jenkins-ci': {'ssl': '_.franzi.business'},
'miniflux': {'ssl': '_.franzi.business'},
'travelynx': {'ssl': '_.franzi.business'},
'franzi.business': {
'webroot': '/var/www/franzi.business/_site/',
'ssl': '_.franzi.business',
@ -156,17 +159,6 @@ nodes['rx300'] = {
},
},
},
'jenkins': {
'domain': 'jenkins.franzi.business',
'ssl': '_.franzi.business',
'locations': {
'/': {
'target': 'http://localhost:22010/',
},
},
'website_check_path': '/login',
'website_check_string': 'Welcome to Jenkins',
},
'unicornsden-redirect': {
'domain': 'unicornsden.franzi.business',
'ssl': '_.franzi.business',
@ -185,21 +177,6 @@ nodes['rx300'] = {
'mode': '0755',
},
},
'travelynx': {
'domain': 'travelynx.franzi.business',
'ssl': '_.franzi.business',
'locations': {
'/': {
'target': 'http://127.0.0.1:22020',
},
'/static': {
'root': '/opt/travelynx/public',
},
'/service-worker.js': {
'root': '/opt/travelynx/public',
},
},
},
'wiki.franzi.business': {
'ssl': '_.franzi.business',
'extras': True,
@ -246,6 +223,7 @@ nodes['rx300'] = {
'travelynx': {
'version': '1.20.3',
'mail_from': 'travelynx@franzi.business',
'domain': 'travelynx.franzi.business',
},
'users': {
'kunsi': {