* added comment for pillar example
* removed override releasever variable use for CentOS
This commit is contained in:
parent
997ef47905
commit
03c4902b9e
@ -55,7 +55,7 @@ nginx_yum_repo:
|
|||||||
- name: nginx
|
- name: nginx
|
||||||
- humanname: nginx repo
|
- humanname: nginx repo
|
||||||
{%- if salt['grains.get']('os') == 'CentOS' %}
|
{%- if salt['grains.get']('os') == 'CentOS' %}
|
||||||
- baseurl: 'http://nginx.org/packages/centos/{{ nginx.lookup.rh_os_releasever }}/$basearch/'
|
- baseurl: 'http://nginx.org/packages/centos/$releasever/$basearch/'
|
||||||
{%- else %}
|
{%- else %}
|
||||||
- baseurl: 'http://nginx.org/packages/rhel/{{ nginx.lookup.rh_os_releasever }}/$basearch/'
|
- baseurl: 'http://nginx.org/packages/rhel/{{ nginx.lookup.rh_os_releasever }}/$basearch/'
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
@ -35,6 +35,7 @@ nginx:
|
|||||||
vhost_available: /etc/nginx/sites-available
|
vhost_available: /etc/nginx/sites-available
|
||||||
vhost_enabled: /etc/nginx/sites-enabled
|
vhost_enabled: /etc/nginx/sites-enabled
|
||||||
vhost_use_symlink: True
|
vhost_use_symlink: True
|
||||||
|
# This is required for RedHat like distros (Amazon Linux) that don't follow semantic versioning for $releasever
|
||||||
rh_os_releasever: '6'
|
rh_os_releasever: '6'
|
||||||
|
|
||||||
# Source compilation is not currently a part of nginx.ng
|
# Source compilation is not currently a part of nginx.ng
|
||||||
|
Loading…
Reference in New Issue
Block a user