From 0bc88a600018177a5ba692121b4d9ba0acdaf8ec Mon Sep 17 00:00:00 2001 From: mwiegand Date: Wed, 17 Nov 2021 18:05:57 +0100 Subject: [PATCH 1/2] wip --- bundles/build-server/items.py | 14 ++++++++++++++ bundles/build-server/metadata.py | 28 +++++++++++++++++----------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/bundles/build-server/items.py b/bundles/build-server/items.py index d09d7bd..088f14c 100644 --- a/bundles/build-server/items.py +++ b/bundles/build-server/items.py @@ -12,6 +12,12 @@ files = { 'owner': 'build-server', 'content': json.dumps(node.metadata.get('build-server'), indent=4, cls=MetadataJSONEncoder) }, + '/opt/build-server/build-server-crystal': { + 'content_type': 'download', + 'source': 'https://dl.sublimity.de/build-server-crystal/build-server-crystal-amd64-latest', + 'owner': 'build-server', + 'mode': '500', + }, '/opt/build-server/strategies/crystal': { 'content_type': 'mako', 'owner': 'build-server', @@ -22,3 +28,11 @@ files = { }, }, } + +svc_systemd = { + 'build-server': { + 'needs': { + 'file:/etc/systemd/system/build-server.service', + }, + }, +} diff --git a/bundles/build-server/metadata.py b/bundles/build-server/metadata.py index f742198..c633a81 100644 --- a/bundles/build-server/metadata.py +++ b/bundles/build-server/metadata.py @@ -1,17 +1,23 @@ from ipaddress import ip_interface defaults = { - 'flask': { - 'build-server' : { - 'git_url': "https://git.sublimity.de/cronekorkn/build-server.git", - 'port': 4000, - 'app_module': 'build_server', - 'user': 'build-server', - 'group': 'build-server', - 'timeout': 900, - 'env': { - 'CONFIG': '/etc/build-server.json', - 'STRATEGIES_DIR': '/opt/build-server/strategies', + 'systemd': { + 'units': { + 'build-server.service': { + 'Unit': { + 'Description': 'build server', + 'After': 'network.target', + }, + 'Service': { + 'User': 'build-server', + 'Group': 'build-server', + 'Environment': 'STRATEGIES_DIR=/opt/build-server/strategies', + 'ExecStart': '/opt/build-server/build-server-crystal --port 4000', + 'Restart': 'always', + }, + 'Install': { + 'WantedBy': {'multi-user.target'}, + }, }, }, }, -- 2.39.5 From 80aec6f8ecb686348d4239ccc01c69192e229359 Mon Sep 17 00:00:00 2001 From: mwiegand Date: Wed, 17 Nov 2021 18:33:31 +0100 Subject: [PATCH 2/2] wip --- bundles/build-server/metadata.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bundles/build-server/metadata.py b/bundles/build-server/metadata.py index c633a81..a883f5f 100644 --- a/bundles/build-server/metadata.py +++ b/bundles/build-server/metadata.py @@ -12,6 +12,7 @@ defaults = { 'User': 'build-server', 'Group': 'build-server', 'Environment': 'STRATEGIES_DIR=/opt/build-server/strategies', + 'WorkingDirectory': '/var/lib/build-server', 'ExecStart': '/opt/build-server/build-server-crystal --port 4000', 'Restart': 'always', }, -- 2.39.5