created a map.jinja and updated openssh state to use those values

This commit is contained in:
Kenny Do 2014-01-03 16:54:51 -08:00
parent 244becf041
commit 0a2468d87a
2 changed files with 28 additions and 11 deletions

View File

@ -1,25 +1,24 @@
{% from "openssh/map.jinja" import openssh with context %}
openssh: openssh:
pkg: pkg.installed:
- installed - name: {{ openssh.server }}
{% if grains['os_family'] == 'Debian' %}
- name: openssh-server
{% endif %}
service.running: service.running:
- enable: True - enable: True
- name: ssh - name: {{ openssh.service }}
- require: - require:
- pkg: openssh - pkg: {{ openssh.server }}
- file: sshd_banner - file: sshd_banner
- watch: - watch:
- file: sshd_config - file: sshd_config
sshd_config: sshd_config:
file.managed: file.managed:
- name: /etc/ssh/sshd_config - name: {{ openssh.sshd_config }}
- source: salt://openssh/files/sshd_config - source: {{ openssh.sshd_config_src }}
sshd_banner: sshd_banner:
file.managed: file.managed:
- name: /etc/ssh/banner - name: {{ openssh.banner }}
- source: salt://openssh/files/banner - source: {{ openssh.banner_src }}
- template: jinja - template: jinja

18
openssh/map.jinja Normal file
View File

@ -0,0 +1,18 @@
{% set openssh = salt['grains.filter_by']({
'Debian': {
'server': 'openssh-server',
'service': 'ssh',
'sshd_config': '/etc/ssh/sshd_config',
'sshd_config_src': 'salt://openssh/files/sshd_config',
'banner': '/etc/ssh/banner',
'banner_src': 'salt://openssh/files/banner',
},
'RedHat': {
'server': 'openssh-server',
'service': 'sshd',
'sshd_config': '/etc/ssh/sshd_config',
'sshd_config_src': 'salt://openssh/files/sshd_config',
'banner': '/etc/ssh/banner',
'banner_src': 'salt://openssh/files/banner',
},
}, merge=salt['pillar.get']('openssh:lookup')) %}