Merge pull request #79 from leansalt/server-service-control

Add ability to control SSH server service status (default: on)
This commit is contained in:
Brian Jackson 2017-01-15 21:48:04 -08:00 committed by GitHub
commit b9689cedff
3 changed files with 10 additions and 1 deletions

View File

@ -1,4 +1,5 @@
openssh: openssh:
sshd_enable: True
sshd_config: /etc/ssh/sshd_config sshd_config: /etc/ssh/sshd_config
sshd_config_src: salt://openssh/files/sshd_config sshd_config_src: salt://openssh/files/sshd_config
ssh_config: /etc/ssh/ssh_config ssh_config: /etc/ssh/ssh_config

View File

@ -5,10 +5,16 @@ openssh:
pkg.installed: pkg.installed:
- name: {{ openssh.server }} - name: {{ openssh.server }}
{% endif %} {% endif %}
{% if openssh.sshd_enable is sameas true %}
service.running: service.running:
- enable: True - enable: {{ openssh.sshd_enable }}
- name: {{ openssh.service }} - name: {{ openssh.service }}
{% if openssh.server is defined %} {% if openssh.server is defined %}
- require: - require:
- pkg: {{ openssh.server }} - pkg: {{ openssh.server }}
{% endif %} {% endif %}
{% else %}
service.dead:
- enable: False
- name: {{ openssh.service }}
{% endif %}

View File

@ -81,6 +81,8 @@ ssh_config:
VisualHostKey: 'no' VisualHostKey: 'no'
openssh: openssh:
# Controls if SSHD should be enabled/started
sshd_enable: true
auth: auth:
joe-valid-ssh-key-desktop: joe-valid-ssh-key-desktop:
- user: joe - user: joe