cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
mwiegand 2021-08-13 01:21:22 +02:00
parent d2c1c6ab0d
commit 53db057485
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bundles/backup-server/metadata.py
View file

@ -8,7 +8,7 @@ defaults = {
}, },
'users': { 'users': {
'backup-receiver': { 'backup-receiver': {
'authorized_keys': [], 'authorized_keys': set(),
}, },
}, },
'sudoers': { 'sudoers': {
@ -78,12 +78,12 @@ def backup_authorized_keys(metadata):
return { return {
'users': { 'users': {
'backup-receiver': { 'backup-receiver': {
'authorized_keys': [ 'authorized_keys': {
other_node.metadata.get('users/root/pubkey') other_node.metadata.get('users/root/pubkey')
for other_node in repo.nodes for other_node in repo.nodes
if other_node.has_bundle('backup') if other_node.has_bundle('backup')
and other_node.metadata.get('backup/server') == node.name and other_node.metadata.get('backup/server') == node.name
], },
}, },
}, },
} }

6
bundles/users/metadata.py
View file

@ -18,11 +18,11 @@ def authorized_users(metadata):
for name, config in metadata.get('users').items(): for name, config in metadata.get('users').items():
users[name] = { users[name] = {
'authorized_keys': [], 'authorized_keys': set(),
} }
for authorized_user in config.get('authorized_users', []): for authorized_user in config.get('authorized_users', []):
authorized_user_name, authorized_user_node = authorized_user.split('@') authorized_user_name, authorized_user_node = authorized_user.split('@')
users[name]['authorized_keys'].append( users[name]['authorized_keys'].add(
repo.get_node(authorized_user_node).metadata.get(f'users/{authorized_user_name}/pubkey') repo.get_node(authorized_user_node).metadata.get(f'users/{authorized_user_name}/pubkey')
) )
return { return {
@ -38,7 +38,7 @@ def user_defaults(metadata):
for name, config in metadata.get('users').items(): for name, config in metadata.get('users').items():
users[name] = { users[name] = {
'authorized_keys': [], 'authorized_keys': set(),
} }
if not 'full_name' in config: if not 'full_name' in config:

4
groups/all.py
View file

@ -12,9 +12,9 @@
'users': { 'users': {
'root': { 'root': {
'shell': '/usr/bin/zsh', 'shell': '/usr/bin/zsh',
'authorized_keys': [ 'authorized_keys': {
'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEU1l2ijW3ZqzFGZcdWg2ESgTGehdNfBTfafxsjWvWdS mwiegand@macbook', 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEU1l2ijW3ZqzFGZcdWg2ESgTGehdNfBTfafxsjWvWdS mwiegand@macbook',
], },
}, },
}, },
} }

4
nodes/htz.mails.py
View file

@ -126,9 +126,9 @@
'authorized_users': [ 'authorized_users': [
'root@home.server', 'root@home.server',
], ],
'authorized_keys': [ 'authorized_keys': {
'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHMKTJLw6Cb+MLt+9JFOkuo2QBpuA8EoTKOFpb3IFQHEq19YLMzOhcErWmzaRfiCnILhnwTQz0njS+n9Qu4aghk= root@mail.sublimity.de' 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHMKTJLw6Cb+MLt+9JFOkuo2QBpuA8EoTKOFpb3IFQHEq19YLMzOhcErWmzaRfiCnILhnwTQz0njS+n9Qu4aghk= root@mail.sublimity.de'
], },
}, },
}, },
'vm': { 'vm': {