Merge pull request #32 from jaanush/master
Added map file to resolve apache utils package name
This commit is contained in:
commit
3a63a8c2bd
8
nginx/map.jinja
Normal file
8
nginx/map.jinja
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{% set nginx = salt['grains.filter_by']({
|
||||||
|
'Debian': {
|
||||||
|
'apache_utils': 'apache2-utils',
|
||||||
|
},
|
||||||
|
'RedHat': {
|
||||||
|
'apache_utils': 'httpd-tools',
|
||||||
|
},
|
||||||
|
}, merge=salt['pillar.get']('nginx:lookup')) %}
|
@ -1,9 +1,9 @@
|
|||||||
{% set nginx = pillar.get('nginx', {}) -%}
|
{% from "nginx/map.jinja" import nginx with context %}
|
||||||
{% set htauth = nginx.get('htpasswd', '/etc/nginx/.htpasswd') -%}
|
{% set htauth = nginx.get('htpasswd', '/etc/nginx/.htpasswd') -%}
|
||||||
|
|
||||||
htpasswd:
|
htpasswd:
|
||||||
pkg.installed:
|
pkg.installed:
|
||||||
- name: apache2-utils
|
- name: {{ nginx.apache_utils }}
|
||||||
|
|
||||||
{% for name, user in pillar.get('users', {}).items() %}
|
{% for name, user in pillar.get('users', {}).items() %}
|
||||||
{% if user['webauth'] is defined -%}
|
{% if user['webauth'] is defined -%}
|
||||||
|
Loading…
Reference in New Issue
Block a user