diff --git a/CHANGELOG.md b/CHANGELOG.md index cc8f3ed..ffec9d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ + +### 1.4.2 (2022-05-12) + +#### Bug Fixes + +* resolve issue with ssh_config variable precedence + + ### 1.4.1 () diff --git a/defaults/main.yml b/defaults/main.yml index abfc001..fd557ad 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -20,7 +20,7 @@ # variable fallback defaults # usually overridden from Play or distro specific vars file -ssh_config: {} +ssh_config: "{{ ssh_config_default }}" ssh_packages: [] ssh_service: sshd diff --git a/vars/debian/bullseye.yml b/vars/debian/bullseye.yml index f5b5176..87a141d 100644 --- a/vars/debian/bullseye.yml +++ b/vars/debian/bullseye.yml @@ -6,7 +6,7 @@ ssh_packages: ssh_service: ssh -ssh_config: +ssh_config_default: Include: /etc/ssh/sshd_config.d/*.conf ChallengeResponseAuthentication: "no" UsePAM: "yes" diff --git a/vars/openbsd.yml b/vars/openbsd.yml index 2141241..2b03cca 100644 --- a/vars/openbsd.yml +++ b/vars/openbsd.yml @@ -4,7 +4,7 @@ ssh_service: sshd sshd_config_group: 'wheel' -ssh_config: +ssh_config_default: PermitRootLogin: "no" AuthorizedKeysFile: .ssh/authorized_keys Subsystem: sftp /usr/libexec/sftp-server diff --git a/vars/ubuntu/bionic.yml b/vars/ubuntu/bionic.yml index 350b61e..f29388b 100644 --- a/vars/ubuntu/bionic.yml +++ b/vars/ubuntu/bionic.yml @@ -5,7 +5,7 @@ ssh_packages: ssh_service: ssh -ssh_config: +ssh_config_default: Port: "{{ ssh_port }}" ListenAddress: "{{ ssh_listen_address }}" PermitRootLogin: "{{ ssh_permit_root_login }}" diff --git a/vars/ubuntu/trusty.yml b/vars/ubuntu/trusty.yml index 8782c9a..b823d33 100644 --- a/vars/ubuntu/trusty.yml +++ b/vars/ubuntu/trusty.yml @@ -5,7 +5,7 @@ ssh_packages: ssh_service: ssh -ssh_config: +ssh_config_default: Port: "{{ ssh_port }}" Protocol: "{{ ssh_protocol }}" ListenAddress: "{{ ssh_listen_address }}" diff --git a/vars/ubuntu/xenial.yml b/vars/ubuntu/xenial.yml index 8782c9a..b823d33 100644 --- a/vars/ubuntu/xenial.yml +++ b/vars/ubuntu/xenial.yml @@ -5,7 +5,7 @@ ssh_packages: ssh_service: ssh -ssh_config: +ssh_config_default: Port: "{{ ssh_port }}" Protocol: "{{ ssh_protocol }}" ListenAddress: "{{ ssh_listen_address }}"