openssh: remove pacman references

This commit is contained in:
Rico 2021-12-21 17:23:18 +01:00
parent c87ab57e1d
commit 592cacb7b8
Signed by: stillbeben
GPG key ID: AE1066B5BD0B5041
2 changed files with 8 additions and 24 deletions

View file

@ -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',
},
},
}

View file

@ -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',
)