From 2e7bde59b45c595a2fc2590987ffa25fb8526a93 Mon Sep 17 00:00:00 2001 From: cronekorkn Date: Fri, 17 Mar 2023 13:01:02 +0100 Subject: [PATCH] wip --- bundles/blog/README.md | 2 ++ bundles/blog/items.py | 8 ++++++++ bundles/blog/metadata.py | 38 ++++++++++++++++++++++++++++++++++++++ nodes/home.server.py | 12 ++++++++++++ nodes/netcup.mails.py | 1 + 5 files changed, 61 insertions(+) create mode 100644 bundles/blog/README.md create mode 100644 bundles/blog/items.py create mode 100644 bundles/blog/metadata.py diff --git a/bundles/blog/README.md b/bundles/blog/README.md new file mode 100644 index 0000000..f2a3ee3 --- /dev/null +++ b/bundles/blog/README.md @@ -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 diff --git a/bundles/blog/items.py b/bundles/blog/items.py new file mode 100644 index 0000000..073bc79 --- /dev/null +++ b/bundles/blog/items.py @@ -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) + # }, +} diff --git a/bundles/blog/metadata.py b/bundles/blog/metadata.py new file mode 100644 index 0000000..de7998a --- /dev/null +++ b/bundles/blog/metadata.py @@ -0,0 +1,38 @@ +from ipaddress import ip_interface + +defaults = { + 'flask': { + 'blog' : { + 'git_url': "https://git.sublimity.de/cronekorkn/blog.git", + 'port': 5000, + 'app_module': 'ckn_blog', + 'env': { + 'CONFIG': '/etc/ckn-blog.json', + }, + }, + }, + 'users': { + 'blog': { + 'home': '/opt/blog', + }, + }, +} + + +@metadata_reactor.provides( + 'nginx/vhosts', +) +def nginx(metadata): + return { + 'nginx': { + 'vhosts': { + metadata.get('build-server/hostname'): { + 'content': 'nginx/proxy_pass.conf', + 'context': { + 'target': 'http://127.0.0.1:4000', + }, + 'check_path': '/status', + }, + }, + }, + } diff --git a/nodes/home.server.py b/nodes/home.server.py index 7a119f0..fe813ce 100644 --- a/nodes/home.server.py +++ b/nodes/home.server.py @@ -37,6 +37,18 @@ 'zfs', ], 'metadata': { + 'dns': { + 'wiegand.tel': { + 'A': {'202.61.255.108'}, + }, + }, + + + + + + + 'id': 'af96709e-b13f-4965-a588-ef2cd476437a', 'network': { 'internal': { diff --git a/nodes/netcup.mails.py b/nodes/netcup.mails.py index f48d2af..ce5702a 100644 --- a/nodes/netcup.mails.py +++ b/nodes/netcup.mails.py @@ -19,6 +19,7 @@ 'steam', 'wireguard', 'zfs', + 'blog', ], 'metadata': { 'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',