Merge remote-tracking branch 'origin/pr/3'

Conflicts:
	openssh/files/sshd_config
	openssh/init.sls
	pillar.example
This commit is contained in:
Seth House
2014-03-17 16:14:17 -06:00
3 changed files with 94 additions and 2 deletions
+16 -1
View File
@@ -40,4 +40,19 @@ openssh:
present: False
enc: ssh-rsa
comment: obsolete key - removed
dsa:
private_key: |
-----BEGIN DSA PRIVATE KEY-----
NOT_DEFINED
-----END DSA PRIVATE KEY-----
public_key: |
ssh-dss NOT_DEFINED
provide_dsa_keys: False
provide_rsa_keys: False
rsa:
private_key: |
-----BEGIN RSA PRIVATE KEY-----
NOT_DEFINED
-----END RSA PRIVATE KEY-----
public_key: |
ssh-rsa NOT_DEFINED