Browse Source

* added pillar variable to specify os release version for nginx package repo base url for RedHat family os hosts

tags/v0.55.0
Roshan Bangera 9 years ago
parent
commit
997ef47905
3 changed files with 4 additions and 2 deletions
  1. +2
    -2
      nginx/ng/install.sls
  2. +1
    -0
      nginx/ng/map.jinja
  3. +1
    -0
      pillar.example

+ 2
- 2
nginx/ng/install.sls View File

@@ -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

+ 1
- 0
nginx/ng/map.jinja View File

@@ -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',

+ 1
- 0
pillar.example View File

@@ -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

Loading…
Cancel
Save