bundles: move non-login users to items.py

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',

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',

bundles/mautrix-telegram/items.py

@@ -24,6 +24,12 @@ actions = {
     },
 }
 
+users = {
+    'mautrix-telegram': {
+        'home': '/opt/mautrix-telegram',
+    },
+}
+
 directories = {
     '/opt/mautrix-telegram/src': {},
 }

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',

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',

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',

bundles/radicale/items.py

@@ -6,6 +6,12 @@ directories = {
     },
 }
 
+users = {
+    'radicale': {
+        'home': '/var/lib/radicale',
+    },
+}
+
 files = {
     '/etc/systemd/system/radicale.service': {
         'triggers': {

bundles/radicale/metadata.py

@@ -4,9 +4,4 @@ defaults = {
             'python3-radicale': {},
         },
     },
-    'users': {
-        'radicale': {
-            'home': '/var/lib/radicale',
-        },
-    },
 }

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': {

bundles/seafile/metadata.py

@@ -7,10 +7,4 @@ defaults = {
             'python3-pip': {},
         },
     },
-    'users': {
-        'seafile': {
-            'home': '/opt/seafile',
-            'home-mode': '0755',
-        },
-    },
 }

bundles/travelynx/items.py

@@ -5,6 +5,12 @@ pkg_apt = {
     'cpanminus': {},
 }
 
+users = {
+    'travelynx': {
+        'home': '/opt/travelynx',
+    },
+}
+
 directories = {
     '/var/cache/travelynx': {
         'owner': 'travelynx',

bundles/travelynx/metadata.py

@@ -1,10 +1,4 @@
 defaults = {
-    'users': {
-        'travelynx': {
-            'home': '/opt/travelynx',
-            'home-mode': '0755',
-        },
-    },
     'travelynx': {
         'database': {
             'username': 'travelynx',

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
 

bundles/voc-loudness-monitor/metadata.py

@@ -4,9 +4,4 @@ defaults = {
             'ffmpeg': {},
         },
     },
-    'users': {
-        'voc': {
-            'home': '/opt/voc-loudness-monitor',
-        },
-    },
 }