l4d config defaults

bundles/left4dead2/files/server.cfg

@@ -0,0 +1,9 @@
+// defaults
+hostname ${server_name}
+motd_enabled 0
+rcon_password ${rcon_password}
+
+// server specific
+% for line in config:
+${line}
+% endfor

bundles/left4dead2/items.py

@@ -44,12 +44,15 @@ svc_systemd = {
 
 for server_name, config in node.metadata.get('left4dead2').items():
     files[f'/opt/l4d2/configs/{server_name}.cfg'] = {
-        'content': '\n'.join(config.get('config', [])) + '\n',
+        'source': 'server.cfg',
+        'content_type': 'mako',
+        'context': {
+            'server_name': server_name,
+            'rcon_password': repo.vault.decrypt('encrypt$gAAAAABpAdZhxwJ47I1AXotuZmBvyZP1ecVTt9IXFkLI28JiVS74LKs9QdgIBz-FC-iXtIHHh_GVGxxKQZprn4UrXZcvZ57kCKxfHBs3cE2JiGnbWE8_mfs=').value,
+            'config': config.get('config', []),
+        },
         'owner': 'steam',
         'mode': '644',
-        'needed_by': {
-            f'svc_systemd:left4dead2-{server_name}.service',
-        },
         'triggers': {
             f'svc_systemd:left4dead2-{server_name}.service:restart',
         },

bundles/systemd/items.py

@@ -47,7 +47,7 @@ for name, unit in node.metadata.get('systemd/units').items():
 
     for attribute in ['needs', 'needed_by', 'triggers', 'triggered_by']:
         if attribute in unit:
-            dependencies[attribute] = unit.pop(attribute)
+            dependencies.setdefault(attribute, []).extend(unit.pop(attribute))
 
     files[path] = {
         'content': repo.libs.systemd.generate_unitfile(unit),

nodes/ovh.secondary.py

@@ -43,9 +43,6 @@
                 'config': [
                     'exec server_original.cfg',
                     'sm_forcematch zonemod',
-                    'hostname server3_comp1_test',
-                    'motd_enabled 0',
-                    'rcon_password ' + vault.decrypt('encrypt$gAAAAABpAdZhxwJ47I1AXotuZmBvyZP1ecVTt9IXFkLI28JiVS74LKs9QdgIBz-FC-iXtIHHh_GVGxxKQZprn4UrXZcvZ57kCKxfHBs3cE2JiGnbWE8_mfs=').value,
                 ],
             },
         },