Compare commits

..

1 commit

Author SHA1 Message Date
2e7bde59b4
wip 2023-03-22 21:08:45 +01:00
5 changed files with 32 additions and 10 deletions

View file

@ -0,0 +1,2 @@
JSON=$(cat bundles/build-server/example.json)
curl -X POST 'https://build.sublimity.de/crystal?file=procio.cr' -H "Content-Type: application/json" --data-binary @- <<< $JSON

View file

@ -0,0 +1,8 @@
directories = {}
files = {
# '/etc/build-server.json': {
# 'owner': 'build-server',
# 'content': json.dumps(node.metadata.get('build-server'), indent=4, sort_keys=True, cls=MetadataJSONEncoder)
# },
}

View file

@ -3,13 +3,17 @@ from ipaddress import ip_interface
defaults = { defaults = {
'flask': { 'flask': {
'blog' : { 'blog' : {
'git_url': "https://git.sublimity.de/cronekorkn/flask-blog.git", 'git_url': "https://git.sublimity.de/cronekorkn/blog.git",
'port': 5010, 'port': 5000,
'app_module': 'blog', 'app_module': 'ckn_blog',
'env': {
'CONFIG': '/etc/ckn-blog.json',
},
}, },
}, },
'users': { 'users': {
'blog': { 'blog': {
'home': '/opt/blog',
}, },
}, },
} }
@ -22,11 +26,12 @@ def nginx(metadata):
return { return {
'nginx': { 'nginx': {
'vhosts': { 'vhosts': {
metadata.get('blog/hostname'): { metadata.get('build-server/hostname'): {
'content': 'nginx/proxy_pass.conf', 'content': 'nginx/proxy_pass.conf',
'context': { 'context': {
'target': 'http://127.0.0.1:5010', 'target': 'http://127.0.0.1:4000',
}, },
'check_path': '/status',
}, },
}, },
}, },

View file

@ -37,6 +37,18 @@
'zfs', 'zfs',
], ],
'metadata': { 'metadata': {
'dns': {
'wiegand.tel': {
'A': {'202.61.255.108'},
},
},
'id': 'af96709e-b13f-4965-a588-ef2cd476437a', 'id': 'af96709e-b13f-4965-a588-ef2cd476437a',
'network': { 'network': {
'internal': { 'internal': {

View file

@ -20,7 +20,6 @@
'wireguard', 'wireguard',
'zfs', 'zfs',
'blog', 'blog',
'flask',
], ],
'metadata': { 'metadata': {
'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae', 'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',
@ -37,10 +36,6 @@
'gateway6': 'fe80::1', 'gateway6': 'fe80::1',
} }
}, },
'blog': {
'hostname': 'wiegand.tel',
'repo': 'https://git.sublimity.de/cronekorkn/blog.git',
},
'bind': { 'bind': {
'hostname': 'resolver.name', 'hostname': 'resolver.name',
'acme_zone': 'acme.sublimity.de', 'acme_zone': 'acme.sublimity.de',