From 6cd02dc5638219bc57b4171c8b10626b6adf55c3 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 10 Nov 2020 13:23:22 +0100 Subject: [PATCH] bundles: move non-login users to items.py --- bundles/gitea/items.py | 9 +++++++++ bundles/gitea/metadata.py | 6 ------ bundles/mautrix-telegram/items.py | 6 ++++++ bundles/mautrix-telegram/metadata.py | 6 ------ bundles/mx-puppet-discord/items.py | 6 ++++++ bundles/mx-puppet-discord/metadata.py | 6 ------ bundles/radicale/items.py | 6 ++++++ bundles/radicale/metadata.py | 5 ----- bundles/seafile/items.py | 14 ++++++++++++++ bundles/seafile/metadata.py | 6 ------ bundles/travelynx/items.py | 6 ++++++ bundles/travelynx/metadata.py | 6 ------ bundles/voc-loudness-monitor/items.py | 6 ++++++ bundles/voc-loudness-monitor/metadata.py | 5 ----- 14 files changed, 53 insertions(+), 40 deletions(-) diff --git a/bundles/gitea/items.py b/bundles/gitea/items.py index 50d5f5a..6ded2aa 100644 --- a/bundles/gitea/items.py +++ b/bundles/gitea/items.py @@ -8,7 +8,16 @@ downloads = { }, } +users = { + 'git': {}, +} + directories = { + '/home/git': { + 'mode': '0755', + 'owner': 'git', + 'group': 'git', + }, '/var/lib/gitea': { 'owner': 'git', 'mode': '0700', diff --git a/bundles/gitea/metadata.py b/bundles/gitea/metadata.py index 6935846..2a4068d 100644 --- a/bundles/gitea/metadata.py +++ b/bundles/gitea/metadata.py @@ -1,10 +1,4 @@ defaults = { - 'users': { - 'git': { - 'do_not_remove_authorized_keys_from_home': True, - 'home-mode': '0755', - }, - }, 'gitea': { 'database': { 'username': 'gitea', diff --git a/bundles/mautrix-telegram/items.py b/bundles/mautrix-telegram/items.py index a16b27a..6f542cd 100644 --- a/bundles/mautrix-telegram/items.py +++ b/bundles/mautrix-telegram/items.py @@ -24,6 +24,12 @@ actions = { }, } +users = { + 'mautrix-telegram': { + 'home': '/opt/mautrix-telegram', + }, +} + directories = { '/opt/mautrix-telegram/src': {}, } diff --git a/bundles/mautrix-telegram/metadata.py b/bundles/mautrix-telegram/metadata.py index 3df707e..898a7e9 100644 --- a/bundles/mautrix-telegram/metadata.py +++ b/bundles/mautrix-telegram/metadata.py @@ -4,12 +4,6 @@ defaults = { 'ffmpeg': {}, }, }, - 'users': { - 'mautrix-telegram': { - 'home': '/opt/mautrix-telegram', - 'home-mode': '0755', - }, - }, 'matrix-synapse': { 'appservice_configs': { '/opt/mautrix-telegram/registration.yaml', diff --git a/bundles/mx-puppet-discord/items.py b/bundles/mx-puppet-discord/items.py index e7c575f..9ea6524 100644 --- a/bundles/mx-puppet-discord/items.py +++ b/bundles/mx-puppet-discord/items.py @@ -10,6 +10,12 @@ directories = { }, } +users = { + 'mx-puppet-discord': { + 'home': '/opt/mx-puppet-discord', + }, +} + files = { '/opt/mx-puppet-discord/config.yaml': { 'owner': 'mx-puppet-discord', diff --git a/bundles/mx-puppet-discord/metadata.py b/bundles/mx-puppet-discord/metadata.py index b18a764..4f1df90 100644 --- a/bundles/mx-puppet-discord/metadata.py +++ b/bundles/mx-puppet-discord/metadata.py @@ -1,10 +1,4 @@ defaults = { - 'users': { - 'mx-puppet-discord': { - 'home': '/opt/mx-puppet-discord', - 'home-mode': '0755', - }, - }, 'matrix-synapse': { 'appservice_configs': { '/opt/mx-puppet-discord/registration.yaml', diff --git a/bundles/radicale/items.py b/bundles/radicale/items.py index 6b2d8e8..7d6335a 100644 --- a/bundles/radicale/items.py +++ b/bundles/radicale/items.py @@ -6,6 +6,12 @@ directories = { }, } +users = { + 'radicale': { + 'home': '/var/lib/radicale', + }, +} + files = { '/etc/systemd/system/radicale.service': { 'triggers': { diff --git a/bundles/radicale/metadata.py b/bundles/radicale/metadata.py index 07526ee..179baac 100644 --- a/bundles/radicale/metadata.py +++ b/bundles/radicale/metadata.py @@ -4,9 +4,4 @@ defaults = { 'python3-radicale': {}, }, }, - 'users': { - 'radicale': { - 'home': '/var/lib/radicale', - }, - }, } diff --git a/bundles/seafile/items.py b/bundles/seafile/items.py index f67e07e..24c6c72 100644 --- a/bundles/seafile/items.py +++ b/bundles/seafile/items.py @@ -1,3 +1,17 @@ +users = { + 'seafile': { + 'home': '/opt/seafile', + }, +} + +directories = { + '/opt/seafile': { + 'mode': '0755', + 'owner': 'seafile', + 'group': 'seafile', + }, +} + files = { '/etc/systemd/system/seafile.service': { 'needed_by': { diff --git a/bundles/seafile/metadata.py b/bundles/seafile/metadata.py index d3e7773..bb301a7 100644 --- a/bundles/seafile/metadata.py +++ b/bundles/seafile/metadata.py @@ -7,10 +7,4 @@ defaults = { 'python3-pip': {}, }, }, - 'users': { - 'seafile': { - 'home': '/opt/seafile', - 'home-mode': '0755', - }, - }, } diff --git a/bundles/travelynx/items.py b/bundles/travelynx/items.py index 3de399b..3f06b2f 100644 --- a/bundles/travelynx/items.py +++ b/bundles/travelynx/items.py @@ -5,6 +5,12 @@ pkg_apt = { 'cpanminus': {}, } +users = { + 'travelynx': { + 'home': '/opt/travelynx', + }, +} + directories = { '/var/cache/travelynx': { 'owner': 'travelynx', diff --git a/bundles/travelynx/metadata.py b/bundles/travelynx/metadata.py index e2d4006..155fa60 100644 --- a/bundles/travelynx/metadata.py +++ b/bundles/travelynx/metadata.py @@ -1,10 +1,4 @@ defaults = { - 'users': { - 'travelynx': { - 'home': '/opt/travelynx', - 'home-mode': '0755', - }, - }, 'travelynx': { 'database': { 'username': 'travelynx', diff --git a/bundles/voc-loudness-monitor/items.py b/bundles/voc-loudness-monitor/items.py index ae51ebf..0617089 100644 --- a/bundles/voc-loudness-monitor/items.py +++ b/bundles/voc-loudness-monitor/items.py @@ -38,6 +38,12 @@ streams = { files = {} svc_systemd = {} +users = { + 'voc': { + 'home': '/opt/voc-loudness-monitor', + }, +} + for stream_id, config in streams.items(): config['id'] = stream_id diff --git a/bundles/voc-loudness-monitor/metadata.py b/bundles/voc-loudness-monitor/metadata.py index 7132cd9..3f02cc5 100644 --- a/bundles/voc-loudness-monitor/metadata.py +++ b/bundles/voc-loudness-monitor/metadata.py @@ -4,9 +4,4 @@ defaults = { 'ffmpeg': {}, }, }, - 'users': { - 'voc': { - 'home': '/opt/voc-loudness-monitor', - }, - }, }