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 = openssh_pillar.get('sshd_config', {}) %}
{% set sshd_config = pillar.get('sshd_config', {}) %}
# This file is managed by salt. Manual changes risk being overwritten.
# The contents of the original sshd_config are kept on the bottom for

View File

@ -1,4 +1,3 @@
openssh:
sshd_config:
Port: 22
Protocol: 2
@ -30,6 +29,7 @@ openssh:
Subsystem: "sftp /usr/lib/openssh/sftp-server"
UsePAM: yes
openssh:
auth:
joe:
- name: JOE_VALID_SSH_PUBLIC_KEY