Compare commits
5 commits
74b3a513f6
...
b9da0221bc
Author | SHA1 | Date | |
---|---|---|---|
Franzi | b9da0221bc | ||
Franzi | 3cdd6ce6ba | ||
Franzi | 8414e3580b | ||
Franzi | 7fffdbab32 | ||
Franzi | a38b66a7c5 |
|
@ -10,15 +10,11 @@ for mount, data in node.metadata.get('nfs-client/mounts',{}).items():
|
|||
unitname = data.get('mountpoint','')[1:].replace('-','\\x2d').replace('/','-')
|
||||
|
||||
directories[data['mountpoint']] = {
|
||||
'owner': None,
|
||||
'group': None,
|
||||
'mode': None,
|
||||
'owner': data.get('owner'),
|
||||
'group': data.get('group'),
|
||||
'mode': data.get('mode'),
|
||||
}
|
||||
|
||||
for parameter in ['mode', 'owner', 'group']:
|
||||
if parameter in data:
|
||||
directories[data['mountpoint']][parameter] = data[parameter]
|
||||
|
||||
if 'suid' not in data['mount_options']:
|
||||
data['mount_options'].add('nosuid')
|
||||
|
||||
|
@ -49,6 +45,13 @@ for mount, data in node.metadata.get('nfs-client/mounts',{}).items():
|
|||
},
|
||||
}
|
||||
else:
|
||||
files['/etc/systemd/system/{}.automount'.format(unitname)] = {
|
||||
'delete': True,
|
||||
'triggers': {
|
||||
"action:systemd-reload",
|
||||
},
|
||||
}
|
||||
|
||||
svc_systemd['{}.mount'.format(unitname)] = {
|
||||
'needs': {
|
||||
'file:/etc/systemd/system/{}.mount'.format(unitname),
|
||||
|
|
|
@ -9,6 +9,7 @@ ExecStart=/opt/crs-scripts/bin/crs_run ${script}
|
|||
WorkingDirectory=/opt/crs-scripts
|
||||
Restart=on-failure
|
||||
RestartSec=10
|
||||
SyslogIdentifier=crs-${worker}
|
||||
|
||||
[Install]
|
||||
WantedBy=crs-worker.target
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
export CRS_TRACKER="${url}"
|
||||
export CRS_TOKEN="${token}"
|
||||
export CRS_SECRET="${secret}"
|
||||
% if use_vaapi:
|
||||
export CRS_USE_VAAPI="yes"
|
||||
% endif
|
||||
|
|
|
@ -12,7 +12,10 @@ directories = {
|
|||
}
|
||||
|
||||
for path in paths:
|
||||
directories[f'/video/{path}'] = {}
|
||||
directories[f'/video/{path}'] = {
|
||||
'owner': 'voc',
|
||||
'group': 'voc',
|
||||
}
|
||||
|
||||
git_deploy = {
|
||||
'/opt/crs-scripts': {
|
||||
|
@ -41,6 +44,7 @@ for worker, script in {
|
|||
'content_type': 'mako',
|
||||
'source': 'crs-runner.service',
|
||||
'context': {
|
||||
'worker': worker,
|
||||
'script': script,
|
||||
},
|
||||
'needs': {
|
||||
|
|
|
@ -17,6 +17,9 @@ defaults = {
|
|||
'libxml-simple-perl': {},
|
||||
},
|
||||
},
|
||||
'voc-tracker-worker': {
|
||||
'use_vaapi': False,
|
||||
},
|
||||
'users': {
|
||||
'voc': {
|
||||
'home': '/opt/voc',
|
||||
|
|
|
@ -9,6 +9,7 @@ nodes['fkusei-locutus'] = {
|
|||
'systemd-boot',
|
||||
'telegraf-battery-usage',
|
||||
'wireguard',
|
||||
'voc-tracker-worker',
|
||||
'zfs',
|
||||
},
|
||||
'groups': {
|
||||
|
@ -130,6 +131,11 @@ nodes['fkusei-locutus'] = {
|
|||
'delete': True,
|
||||
},
|
||||
},
|
||||
'voc-tracker-worker': {
|
||||
'url': 'https://tracker.c3voc.de/rpc',
|
||||
'token': vault.decrypt('encrypt$gAAAAABiYqaFl4CqOc8DTQIn49Qq0KgAJSzA19GKPNMbyHIjYg0JkvY0sK43ps8CbJWMRR6hJHVK-nP4vrWLwyoWWqt8N8aASMur4odC2s8pEHQKM0TXg4cRwobQz_lyJgrYa2VYdhcD'),
|
||||
'secret': vault.decrypt('encrypt$gAAAAABiYqaYbY-3IbnRk-S25pqxrOGN7ovgPo3kBYz8ZqKDedPRzskKZefpLHxBbCOZKjg1XNT4cKbIs5cPCLdj7HdY4beAhnXl4EHZZdxU1zVC7sJCmz9XOS_Ac0UOgOlUFMiet14U'),
|
||||
},
|
||||
'wireguard': {
|
||||
'privatekey': vault.decrypt('smedia$NotViaThisRepository'),
|
||||
'peers': {
|
||||
|
|
|
@ -60,7 +60,7 @@ nodes['htz-cloud.miniserver'] = {
|
|||
},
|
||||
'element-web': {
|
||||
'url': 'chat.sophies-kitchen.eu',
|
||||
'version': 'v1.10.10',
|
||||
'version': 'v1.10.11',
|
||||
'config': {
|
||||
'default_server_config': {
|
||||
'm.homeserver': {
|
||||
|
@ -133,6 +133,7 @@ nodes['htz-cloud.miniserver'] = {
|
|||
},
|
||||
'matrix-media-repo': {
|
||||
'version': 'v1.2.12',
|
||||
'sha1': 'c2dfa521c2eea9a0dcde9f1c7803f52ce6d0352e',
|
||||
'homeservers': {
|
||||
'sophies-kitchen.eu': {
|
||||
'domain': 'http://[::1]:20080/',
|
||||
|
@ -153,7 +154,7 @@ nodes['htz-cloud.miniserver'] = {
|
|||
},
|
||||
},
|
||||
'mautrix-telegram': {
|
||||
'version': 'v0.11.2',
|
||||
'version': 'v0.11.3',
|
||||
'homeserver': {
|
||||
'domain': 'sophies-kitchen.eu',
|
||||
'url': 'https://matrix.sophies-kitchen.eu',
|
||||
|
|
|
@ -188,6 +188,12 @@ nodes['kunsi-p14s'] = {
|
|||
'bundle:vmhost',
|
||||
},
|
||||
},
|
||||
'zroot/system/video': {
|
||||
'mountpoint': '/video',
|
||||
'needed_by': {
|
||||
'bundle:voc-tracker-worker',
|
||||
},
|
||||
},
|
||||
'zroot/system/root': {
|
||||
'canmount': 'noauto',
|
||||
'mountpoint': '/',
|
||||
|
@ -206,6 +212,7 @@ nodes['kunsi-p14s'] = {
|
|||
'snapshot_never': {
|
||||
'zroot/movies',
|
||||
'zroot/system/journal',
|
||||
'zroot/system/video',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
@ -103,7 +103,7 @@ nodes['rx300'] = {
|
|||
},
|
||||
'element-web': {
|
||||
'url': 'chat.franzi.business',
|
||||
'version': 'v1.10.10',
|
||||
'version': 'v1.10.11',
|
||||
'config': {
|
||||
'default_server_config': {
|
||||
'm.homeserver': {
|
||||
|
@ -126,8 +126,8 @@ nodes['rx300'] = {
|
|||
},
|
||||
},
|
||||
'gitea': {
|
||||
'version': '1.16.5',
|
||||
'sha1': '2ddaf011428753da0d7ef0ef5c7f36c7f21cd3c7',
|
||||
'version': '1.16.6',
|
||||
'sha1': '9dcfc4093e35923c25261d3d19e33207f5a0f2bc',
|
||||
'domain': 'git.franzi.business',
|
||||
'email_domain_blocklist': {
|
||||
'aol.com',
|
||||
|
@ -227,7 +227,7 @@ nodes['rx300'] = {
|
|||
},
|
||||
},
|
||||
'mautrix-telegram': {
|
||||
'version': 'v0.11.2',
|
||||
'version': 'v0.11.3',
|
||||
'homeserver': {
|
||||
'domain': 'franzi.business',
|
||||
'url': 'https://matrix.franzi.business',
|
||||
|
@ -250,8 +250,8 @@ nodes['rx300'] = {
|
|||
},
|
||||
},
|
||||
'mautrix-whatsapp': {
|
||||
'version': 'v0.3.0',
|
||||
'sha1': '10d65afccb4e7e477125310088022a137a4f0589',
|
||||
'version': 'v0.3.1',
|
||||
'sha1': '761eb892650fa943e7c4fea6f285ca37ba1e5113',
|
||||
'homeserver': {
|
||||
'domain': 'franzi.business',
|
||||
'url': 'https://matrix.franzi.business',
|
||||
|
|
Loading…
Reference in a new issue