From 36302b343f57f5eecc602b5416bd03b7d6087b42 Mon Sep 17 00:00:00 2001 From: cronekorkn Date: Wed, 22 Mar 2023 22:05:40 +0100 Subject: [PATCH 1/2] wip --- bundles/blog/README.md | 0 bundles/blog/items.py | 0 bundles/blog/metadata.py | 33 +++++++++++++++++++++++++++++++++ nodes/netcup.mails.py | 6 ++++++ 4 files changed, 39 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..e69de29 diff --git a/bundles/blog/items.py b/bundles/blog/items.py new file mode 100644 index 0000000..e69de29 diff --git a/bundles/blog/metadata.py b/bundles/blog/metadata.py new file mode 100644 index 0000000..036799a --- /dev/null +++ b/bundles/blog/metadata.py @@ -0,0 +1,33 @@ +from ipaddress import ip_interface + +defaults = { + 'flask': { + 'blog' : { + 'git_url': "https://git.sublimity.de/cronekorkn/flask-blog.git", + 'port': 5010, + 'app_module': 'blog', + }, + }, + 'users': { + 'blog': { + }, + }, +} + + +@metadata_reactor.provides( + 'nginx/vhosts', +) +def nginx(metadata): + return { + 'nginx': { + 'vhosts': { + metadata.get('blog/hostname'): { + 'content': 'nginx/proxy_pass.conf', + 'context': { + 'target': 'http://127.0.0.1:5010', + }, + }, + }, + }, + } diff --git a/nodes/netcup.mails.py b/nodes/netcup.mails.py index f48d2af..903cc43 100644 --- a/nodes/netcup.mails.py +++ b/nodes/netcup.mails.py @@ -19,6 +19,8 @@ 'steam', 'wireguard', 'zfs', + 'blog', + 'flask', ], 'metadata': { 'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae', @@ -35,6 +37,10 @@ 'gateway6': 'fe80::1', } }, + 'blog': { + 'hostname': 'wiegand.tel', + 'repo': 'https://git.sublimity.de/cronekorkn/blog.git', + }, 'bind': { 'hostname': 'resolver.name', 'acme_zone': 'acme.sublimity.de', -- 2.39.5 From db11dd933a27d3b22e4d7c53595a9e74de0ae9f6 Mon Sep 17 00:00:00 2001 From: cronekorkn Date: Thu, 23 Mar 2023 10:01:04 +0100 Subject: [PATCH 2/2] wip --- bundles/blog/metadata.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bundles/blog/metadata.py b/bundles/blog/metadata.py index 036799a..a4cfa7e 100644 --- a/bundles/blog/metadata.py +++ b/bundles/blog/metadata.py @@ -6,11 +6,13 @@ defaults = { 'git_url': "https://git.sublimity.de/cronekorkn/flask-blog.git", 'port': 5010, 'app_module': 'blog', + 'env': { + 'DATA_PATH': '/var/blog', + }, }, }, 'users': { - 'blog': { - }, + 'blog': {}, }, } -- 2.39.5