From ccb6dcd14f7628af38151e2deb03ba0156caf1b7 Mon Sep 17 00:00:00 2001
From: cronekorkn <git@ckn.li>
Date: Thu, 1 Dec 2022 19:11:55 +0100
Subject: [PATCH] l4d fixes

---
 bundles/left4dead2/items.py    | 20 +++++++++++---------
 bundles/left4dead2/metadata.py |  2 +-
 nodes/netcup.mails.py          |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/bundles/left4dead2/items.py b/bundles/left4dead2/items.py
index 483afbe..2cc36aa 100644
--- a/bundles/left4dead2/items.py
+++ b/bundles/left4dead2/items.py
@@ -4,12 +4,7 @@ directories = {
     '/opt/steam/left4dead2/left4dead2/ems/admin system': {
         'owner': 'steam',
         'group': 'steam',
-        'mode': '0744',
-    },
-    '/opt/steam/left4dead2/left4dead2/cfg/server': {
-        'owner': 'steam',
-        'group': 'steam',
-        'purge': True,
+        'mode': '0755',
     },
     '/opt/steam/left4dead2/left4dead2/addons': {
         'owner': 'steam',
@@ -19,12 +14,19 @@ directories = {
             *[f'svc_systemd:left4dead2-{name}.service:restart' for name in node.metadata.get('left4dead2/servers')],
         ],
     },
+    '/opt/steam/left4dead2-servers': {
+        'owner': 'steam',
+        'group': 'steam',
+        'mode': '0755',
+        'purge': True,
+    },
     # Current zfs doesnt support zfs upperdir. The support was added in October 2022. Move upperdir - unused anyway -
     # to another dir. Also move workdir alongside it, as it has to be on same fs.
     '/opt/steam-zfs-overlay-workarounds': {
         'owner': 'steam',
         'group': 'steam',
-        'mode': '0744',
+        'mode': '0755',
+        'purge': True,
     },
 }
 
@@ -71,7 +73,7 @@ for name, config in node.metadata.get('left4dead2/servers').items():
     directories[f'/opt/steam-zfs-overlay-workarounds/{name}/workdir'] = {}
 
     # conf
-    files[f'/opt/steam/left4dead2/left4dead2/cfg/server/{name}.cfg'] = {
+    files[f'/opt/steam/left4dead2-servers/{name}/left4dead2/cfg/server.cfg'] = {
         'content_type': 'mako',
         'source': 'server.cfg',
         'context': {
@@ -116,7 +118,7 @@ for name, config in node.metadata.get('left4dead2/servers').items():
     # service
     svc_systemd[f'left4dead2-{name}.service'] = {
         'needs': [
-            f'file:/opt/steam/left4dead2/left4dead2/cfg/server/{name}.cfg',
+            f'file:/opt/steam/left4dead2-servers/{name}/left4dead2/cfg/server.cfg',
             f'file:/usr/local/lib/systemd/system/left4dead2-{name}.service',
         ],
     }
diff --git a/bundles/left4dead2/metadata.py b/bundles/left4dead2/metadata.py
index 3eb3e13..757f27e 100644
--- a/bundles/left4dead2/metadata.py
+++ b/bundles/left4dead2/metadata.py
@@ -77,7 +77,7 @@ def server_units(metadata):
                 'User': 'steam',
                 'Group': 'steam',
                 'WorkingDirectory': f'/opt/steam/left4dead2-servers/{name}',
-                'ExecStart': f'/opt/steam/left4dead2-servers/{name}/srcds_run -port {config["port"]} +exec server/{name}.cfg',
+                'ExecStart': f'/opt/steam/left4dead2-servers/{name}/srcds_run -port {config["port"]} +exec server.cfg',
                 'Restart': 'on-failure',
             },
             'Install': {
diff --git a/nodes/netcup.mails.py b/nodes/netcup.mails.py
index 855ed2c..7a1f076 100644
--- a/nodes/netcup.mails.py
+++ b/nodes/netcup.mails.py
@@ -82,7 +82,7 @@
                 'standard-2': {
                     'port': 27021,
                     'workshop': {
-                        2256379828, # bhop detect
+                        #2256379828, # bhop detect
                     },
                 },
             },