From 66c954ed662c9a0bdb3813f4e23d2dabfcfa4570 Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Sat, 4 Mar 2017 14:19:52 +0100 Subject: [PATCH] Set correct ssh(d)_config_group for *BSD --- openssh/known_hosts.sls | 2 +- openssh/map.jinja | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openssh/known_hosts.sls b/openssh/known_hosts.sls index 9541e55..cb12a42 100644 --- a/openssh/known_hosts.sls +++ b/openssh/known_hosts.sls @@ -11,7 +11,7 @@ manage ssh_known_hosts file: - source: salt://openssh/files/ssh_known_hosts - template: jinja - user: root - - group: {{ openssh.root_group }} + - group: {{ openssh.ssh_config_group }} - mode: 644 - require: - pkg: ensure dig is available diff --git a/openssh/map.jinja b/openssh/map.jinja index 938b498..efe8daf 100644 --- a/openssh/map.jinja +++ b/openssh/map.jinja @@ -20,11 +20,13 @@ that differ from whats in defaults.yaml 'FreeBSD': { 'service': 'sshd', 'dig_pkg': 'bind-tools', - 'root_group': 'wheel', + 'sshd_config_group': 'wheel', + 'ssh_config_group': 'wheel', }, 'OpenBSD': { 'service': 'sshd', - 'root_group': 'wheel', + 'sshd_config_group': 'wheel', + 'ssh_config_group': 'wheel', }, 'Gentoo': { 'server': 'net-misc/openssh',