@@ -55,9 +55,9 @@ nginx_yum_repo: | |||
- name: nginx | |||
- humanname: nginx repo | |||
{%- if salt['grains.get']('os') == 'CentOS' %} | |||
- baseurl: 'http://nginx.org/packages/centos/$releasever/$basearch/' | |||
- baseurl: 'http://nginx.org/packages/centos/{{ nginx.lookup.rh_os_releasever }}/$basearch/' | |||
{%- else %} | |||
- baseurl: 'http://nginx.org/packages/rhel/$releasever/$basearch/' | |||
- baseurl: 'http://nginx.org/packages/rhel/{{ nginx.lookup.rh_os_releasever }}/$basearch/' | |||
{%- endif %} | |||
- gpgcheck: False | |||
- enabled: True |
@@ -25,6 +25,7 @@ | |||
'vhost_enabled': '/etc/nginx/conf.d', | |||
'vhost_use_symlink': False, | |||
'pid_file': '/var/run/nginx.pid', | |||
'rh_os_releasever': '$releasever', | |||
}, | |||
'Suse': { | |||
'package': 'nginx', |
@@ -35,6 +35,7 @@ nginx: | |||
vhost_available: /etc/nginx/sites-available | |||
vhost_enabled: /etc/nginx/sites-enabled | |||
vhost_use_symlink: True | |||
rh_os_releasever: '6' | |||
# Source compilation is not currently a part of nginx.ng | |||
from_source: False |