From 9f8a64a653c0d6a312dd0372de70e7d79ec32840 Mon Sep 17 00:00:00 2001
From: cronekorkn <git@ckn.li>
Date: Sat, 3 Dec 2022 17:33:42 +0100
Subject: [PATCH] remove steam.target

---
 bundles/left4dead2/items.py                 | 17 ++++++++++++++---
 bundles/left4dead2/metadata.py              | 10 +++++-----
 bundles/steam-workshop-download/metadata.py |  2 +-
 bundles/steam/metadata.py                   | 12 +-----------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/bundles/left4dead2/items.py b/bundles/left4dead2/items.py
index 2cc36aa..ad2d0f9 100644
--- a/bundles/left4dead2/items.py
+++ b/bundles/left4dead2/items.py
@@ -33,6 +33,8 @@ directories = {
 files = {
     '/opt/steam/left4dead2/left4dead2/ems/admin system/admins.txt': {
         'owner': 'steam',
+        'group': 'steam',
+        'mode': '0755',
         'content': '\n'.join(sorted(node.metadata.get('left4dead2/admins'))),
     },
     '/opt/steam/left4dead2/left4dead2/addons/readme.txt': {
@@ -68,9 +70,18 @@ symlinks = {
 for name, config in node.metadata.get('left4dead2/servers').items():
 
     #overlay
-    directories[f'/opt/steam/left4dead2-servers/{name}'] = {}
-    directories[f'/opt/steam-zfs-overlay-workarounds/{name}/upper'] = {}
-    directories[f'/opt/steam-zfs-overlay-workarounds/{name}/workdir'] = {}
+    directories[f'/opt/steam/left4dead2-servers/{name}'] = {
+        'owner': 'steam',
+        'group': 'steam',
+    }
+    directories[f'/opt/steam-zfs-overlay-workarounds/{name}/upper'] = {
+        'owner': 'steam',
+        'group': 'steam',
+    }
+    directories[f'/opt/steam-zfs-overlay-workarounds/{name}/workdir'] = {
+        'owner': 'steam',
+        'group': 'steam',
+    }
 
     # conf
     files[f'/opt/steam/left4dead2-servers/{name}/left4dead2/cfg/server.cfg'] = {
diff --git a/bundles/left4dead2/metadata.py b/bundles/left4dead2/metadata.py
index 7408568..f7906bb 100644
--- a/bundles/left4dead2/metadata.py
+++ b/bundles/left4dead2/metadata.py
@@ -45,7 +45,7 @@ def workshop_download(metadata):
                     'path': '/opt/steam/left4dead2/left4dead2/addons',
                     'user': 'steam',
                     'requires': {
-                        'steam.target',
+                        'steam-update.service',
                     },
                     'required_by': {
                         f'left4dead2-{name}.service'
@@ -73,8 +73,8 @@ def server_units(metadata):
         units[mount_unit_name] = {
             'Unit': {
                 'Description': f"Mount left4dead2 server {name} overlay",
-                'Conflicts': 'umount.target',
-                'Before': 'umount.target',
+                'Conflicts': {'umount.target'},
+                'Before': {'umount.target'},
             },
             'Mount': {
                 'What': 'overlay',
@@ -112,8 +112,8 @@ def server_units(metadata):
         units[f'left4dead2-{name}.service'] = {
             'Unit': {
                 'Description': f'left4dead2 server {name}',
-                'After': {'steam.target'},
-                'Requires': {'steam.target'},
+                'After': {'steam-update.service'},
+                'Requires': {'steam-update.service'},
             },
             'Service': {
                 'User': 'steam',
diff --git a/bundles/steam-workshop-download/metadata.py b/bundles/steam-workshop-download/metadata.py
index 15ef9c9..b51fbe5 100644
--- a/bundles/steam-workshop-download/metadata.py
+++ b/bundles/steam-workshop-download/metadata.py
@@ -20,7 +20,7 @@ def workshop(metadata):
                     'network-online.target',
                     'steam-update.target',
                 },
-                'Before': 'steam.target',
+                'Before': 'steam-update.service',
                 'Requires': conf['requires'],
             },
             'Service': {
diff --git a/bundles/steam/metadata.py b/bundles/steam/metadata.py
index bcbdb2c..6b962de 100644
--- a/bundles/steam/metadata.py
+++ b/bundles/steam/metadata.py
@@ -10,15 +10,6 @@ defaults = {
             'left4dead2': 222860,
         },
     },
-    'systemd': {
-        'units': {
-            'steam.target': {
-                'Unit': {
-                    'Description': 'steam is ready',
-                },
-            },
-        },
-    },
     'zfs': {
         'datasets': {
             'tank/steam': {
@@ -41,7 +32,6 @@ def initial_unit(metadata):
                     'Unit': {
                         'Description': 'steam: install and update games',
                         'After': 'network-online.target',
-                        'Before': 'steam.target',
                     },
                     'Service': {
                         'Type': 'oneshot',
@@ -54,7 +44,7 @@ def initial_unit(metadata):
                         }
                     },
                     'Install': {
-                        'RequiredBy': {'steam.target'},
+                        'WantedBy': {'multi-user.target'},
                     },
                 },
             },