Browse Source

Merge pull request #24 from fpletz/feature/ed25519_host_keys

Add support for ed25519 host keys
master
Wolodja Wentland 10 years ago
parent
commit
e4944f7f8f
2 changed files with 20 additions and 7 deletions
  1. +2
    -2
      openssh/config.sls
  2. +18
    -5
      pillar.example

+ 2
- 2
openssh/config.sls View File

- watch_in: - watch_in:
- service: openssh - service: openssh


{% for keyType in ['ecdsa', 'dsa', 'rsa'] %}
{% for keyType in ['ecdsa', 'dsa', 'rsa', 'ed25519'] %}
{% if salt['pillar.get']('openssh:generate_' ~ keyType ~ '_keys', False) %} {% if salt['pillar.get']('openssh:generate_' ~ keyType ~ '_keys', False) %}
ssh_generate_host_{{ keyType }}_key: ssh_generate_host_{{ keyType }}_key:
cmd.run: cmd.run:
- require_in: - require_in:
- service: {{ openssh.service }} - service: {{ openssh.service }}
{% endif %} {% endif %}
{% endfor %}
{% endfor %}

+ 18
- 5
pillar.example View File

present: False present: False
enc: ssh-rsa enc: ssh-rsa
comment: obsolete key - removed comment: obsolete key - removed

generate_dsa_keys: False
provide_dsa_keys: False
dsa: dsa:
private_key: | private_key: |
-----BEGIN DSA PRIVATE KEY----- -----BEGIN DSA PRIVATE KEY-----
-----END DSA PRIVATE KEY----- -----END DSA PRIVATE KEY-----
public_key: | public_key: |
ssh-dss NOT_DEFINED ssh-dss NOT_DEFINED

generate_ecdsa_keys: False
provide_ecdsa_keys: False
ecdsa: ecdsa:
private_key: | private_key: |
-----BEGIN EC PRIVATE KEY----- -----BEGIN EC PRIVATE KEY-----
-----END EC PRIVATE KEY----- -----END EC PRIVATE KEY-----
public_key: | public_key: |
ecdsa-sha2-nistp256 NOT_DEFINED ecdsa-sha2-nistp256 NOT_DEFINED
provide_dsa_keys: False
provide_ecdsa_keys: False
provide_rsa_keys: False
generate_dsa_keys: False
generate_ecdsa_keys: False

generate_rsa_keys: False generate_rsa_keys: False
provide_rsa_keys: False
rsa: rsa:
private_key: | private_key: |
-----BEGIN RSA PRIVATE KEY----- -----BEGIN RSA PRIVATE KEY-----
-----END RSA PRIVATE KEY----- -----END RSA PRIVATE KEY-----
public_key: | public_key: |
ssh-rsa NOT_DEFINED ssh-rsa NOT_DEFINED

generate_ed25519_keys: False
provide_ed25519_keys: False
ed25519:
private_key: |
-----BEGIN OPENSSH PRIVATE KEY-----
NOT_DEFINED
-----END OPENSSH PRIVATE KEY-----
public_key: |
ssh-ed25519 NOT_DEFINED

Loading…
Cancel
Save