Reverted the namespace change to avoid conflicts and backward incompatibilities

This commit is contained in:
Carlos Perelló Marín 2014-02-09 23:42:52 +01:00
parent 47211d0648
commit e2cddca13e
2 changed files with 32 additions and 33 deletions

View File

@ -1,5 +1,4 @@
{% set openssh_pillar = pillar.get('openssh', {}) %} {% set sshd_config = pillar.get('sshd_config', {}) %}
{% set sshd_config = openssh_pillar.get('sshd_config', {}) %}
# This file is managed by salt. Manual changes risk being overwritten. # This file is managed by salt. Manual changes risk being overwritten.
# The contents of the original sshd_config are kept on the bottom for # The contents of the original sshd_config are kept on the bottom for

View File

@ -1,35 +1,35 @@
openssh: sshd_config:
sshd_config: Port: 22
Port: 22 Protocol: 2
Protocol: 2 HostKey:
HostKey: - /etc/ssh/ssh_host_rsa_key
- /etc/ssh/ssh_host_rsa_key - /etc/ssh/ssh_host_dsa_key
- /etc/ssh/ssh_host_dsa_key - /etc/ssh/ssh_host_ecdsa_key
- /etc/ssh/ssh_host_ecdsa_key UsePrivilegeSeparation: yes
UsePrivilegeSeparation: yes KeyRegenerationInterval: 3600
KeyRegenerationInterval: 3600 ServerKeyBits: 768
ServerKeyBits: 768 SyslogFacility: AUTH
SyslogFacility: AUTH LogLevel: INFO
LogLevel: INFO LoginGraceTime: 120
LoginGraceTime: 120 PermitRootLogin: yes
PermitRootLogin: yes StrictModes: yes
StrictModes: yes RSAAuthentication: yes
RSAAuthentication: yes PubkeyAuthentication: yes
PubkeyAuthentication: yes IgnoreRhosts: yes
IgnoreRhosts: yes RhostsRSAAuthentication: no
RhostsRSAAuthentication: no HostbasedAuthentication: no
HostbasedAuthentication: no PermitEmptyPasswords: no
PermitEmptyPasswords: no ChallengeResponseAuthentication: no
ChallengeResponseAuthentication: no X11Forwarding: yes
X11Forwarding: yes X11DisplayOffset: 10
X11DisplayOffset: 10 PrintMotd: no
PrintMotd: no PrintLastLog: yes
PrintLastLog: yes TCPKeepAlive: yes
TCPKeepAlive: yes AcceptEnv: "LANG LC_*"
AcceptEnv: "LANG LC_*" Subsystem: "sftp /usr/lib/openssh/sftp-server"
Subsystem: "sftp /usr/lib/openssh/sftp-server" UsePAM: yes
UsePAM: yes
openssh:
auth: auth:
joe: joe:
- name: JOE_VALID_SSH_PUBLIC_KEY - name: JOE_VALID_SSH_PUBLIC_KEY