diff --git a/bundles/openssh/items.py b/bundles/openssh/items.py index a93b873..89b7a71 100644 --- a/bundles/openssh/items.py +++ b/bundles/openssh/items.py @@ -27,29 +27,28 @@ files = { }, } -if node.has_bundle('pacman'): - package = 'pkg_pacman:openssh' - service = 'sshd' -else: - package = 'pkg_apt:openssh-server' - service = 'ssh' +pkg_apt = { + 'openssh-client': {}, + 'openssh-server': {}, + 'openssh-sftp-server': {}, +} actions = { 'sshd_check_config': { 'command': 'sshd -T -C user=root -C host=localhost -C addr=localhost', 'triggered': True, 'triggers': { - 'svc_systemd:{}:restart'.format(service), + 'svc_systemd:sshd:restart', }, }, } svc_systemd = { - service: { + 'sshd': { 'needs': { 'file:/etc/systemd/system/ssh.service.d/bundlewrap.conf', 'file:/etc/ssh/sshd_config', - package, + 'pkg_apt:openssh-server', }, }, } diff --git a/bundles/openssh/metadata.py b/bundles/openssh/metadata.py index 3cad1b9..c533fcb 100644 --- a/bundles/openssh/metadata.py +++ b/bundles/openssh/metadata.py @@ -1,20 +1,5 @@ from bundlewrap.metadata import atomic -defaults = { - 'apt': { - 'packages': { - 'openssh-client': {}, - 'openssh-server': {}, - 'openssh-sftp-server': {}, - }, - }, - 'pacman': { - 'packages': { - 'openssh': {}, - }, - }, -} - @metadata_reactor.provides( 'firewall/port_rules/22', )