Compare commits

..

No commits in common. "49346ba20b1e374ec6d91a1f88c070ca63a8f3dd" and "1340aaf52e4351e14fa867b5390d3e8a16e0d7b6" have entirely different histories.

6 changed files with 6 additions and 21 deletions

View file

@ -114,6 +114,6 @@ for name, conf in node.metadata.get('flask').items():
svc_systemd[name] = { svc_systemd[name] = {
'needs': [ 'needs': [
f'action:flask_{name}_pip_install', f'action:flask_{name}_pip_install',
f'file:/usr/local/lib/systemd/system/{name}.service', f'file:/etc/systemd/system/{name}.service',
], ],
} }

View file

@ -70,7 +70,7 @@ for name, config in node.metadata.get('left4dead2/servers').items():
} }
svc_systemd[f'left4dead2-server-{name}'] = { svc_systemd[f'left4dead2-server-{name}'] = {
'needs': [ 'needs': [
f'file:/usr/local/lib/systemd/system/left4dead2-server-{name}.service', f'file:/etc/systemd/system/left4dead2-server-{name}.service',
], ],
} }
server_units.add(f'left4dead2-server-{name}') server_units.add(f'left4dead2-server-{name}')
@ -87,7 +87,7 @@ for id in node.metadata.get('left4dead2/workshop'):
# TIDYUP # TIDYUP
find_obsolete_units = ( find_obsolete_units = (
'find /usr/local/lib/systemd/system -type f -name "left4dead2-server-*.service" ' + 'find /etc/systemd/system -type f -name "left4dead2-server-*.service" ' +
' '.join(f"! -name '{name}.service'" for name in server_units) ' '.join(f"! -name '{name}.service'" for name in server_units)
) )
actions['remove_obsolete_left4dead2_units'] = { actions['remove_obsolete_left4dead2_units'] = {

View file

@ -54,6 +54,6 @@ actions = {
svc_systemd['steam-update'] = { svc_systemd['steam-update'] = {
'running': False, 'running': False,
'needs': { 'needs': {
'file:/usr/local/lib/systemd/system/steam-update.service', 'file:/etc/systemd/system/steam-update.service',
} }
} }

View file

@ -1,11 +1,5 @@
# SYSTEMD # SYSTEMD
## show unit paths
```
systemctl --no-pager --property=UnitPath show | tr ' ' '\n'
```
## metadata ## metadata
```python ```python

View file

@ -1,14 +1,5 @@
from bundlewrap.utils.dicts import merge_dict from bundlewrap.utils.dicts import merge_dict
directories = {
'/usr/local/lib/systemd/system': {
'purge': True,
'triggers': [
"action:systemd-reload",
],
},
}
actions = { actions = {
'systemd-reload': { 'systemd-reload': {
'command': 'systemctl daemon-reload', 'command': 'systemctl daemon-reload',
@ -31,7 +22,7 @@ for name, unit in node.metadata.get('systemd/units').items():
], ],
} }
elif extension in ['timer', 'service', 'mount', 'swap']: elif extension in ['timer', 'service', 'mount', 'swap']:
path = f'/usr/local/lib/systemd/system/{name}' path = f'/etc/systemd/system/{name}'
dependencies = { dependencies = {
'triggers': [ 'triggers': [
"action:systemd-reload", "action:systemd-reload",

View file

@ -81,7 +81,7 @@
}, },
'nextcloud': { 'nextcloud': {
'hostname': 'cloud.sublimity.de', 'hostname': 'cloud.sublimity.de',
'version': '23.0.3', 'version': '23.0.2',
}, },
'nextcloud-picsort': { 'nextcloud-picsort': {
'ckn': { 'ckn': {