From 0b667cbcf5e6560d3e92dc5d36b6649c629bfcd7 Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Tue, 21 Jul 2020 11:49:22 +0200 Subject: [PATCH] fix(known_hosts): dig package does not install on Arch The conditionnal on `ensure dig is available` does not work on Arch since the `which` command does not exists. As the `pkg.installed` state is idempotent, we don't need an extra check which depends on the environment. The `dig` utility is provided by `bind` on Arch and no more by `bind-tools`. --- openssh/known_hosts.sls | 1 - openssh/osfamilymap.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/openssh/known_hosts.sls b/openssh/known_hosts.sls index db0e267..c196707 100644 --- a/openssh/known_hosts.sls +++ b/openssh/known_hosts.sls @@ -5,7 +5,6 @@ ensure dig is available: pkg.installed: - name: {{ openssh.dig_pkg }} - - unless: which dig manage ssh_known_hosts file: file.managed: diff --git a/openssh/osfamilymap.yaml b/openssh/osfamilymap.yaml index 3d98529..ca9e564 100644 --- a/openssh/osfamilymap.yaml +++ b/openssh/osfamilymap.yaml @@ -6,7 +6,7 @@ Arch: server: openssh client: openssh service: sshd - dig_pkg: bind-tools + dig_pkg: bind sshd_config: Subsystem: sftp /usr/lib/ssh/sftp-server