saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84 from rbang1/master

Browse Source 
Fix for incorrect pkg repo base url on Amazon Linux on EC2
This commit is contained in:
Forrest 2015-06-30 20:24:38 -07:00
commit dcc47700da
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nginx/ng/install.sls
View File

@ -57,7 +57,7 @@ nginx_yum_repo:
{%- if salt['grains.get']('os') == 'CentOS' %} {%- if salt['grains.get']('os') == 'CentOS' %}
- baseurl: 'http://nginx.org/packages/centos/$releasever/$basearch/' - baseurl: 'http://nginx.org/packages/centos/$releasever/$basearch/'
{%- else %} {%- else %}
- baseurl: 'http://nginx.org/packages/rhel/$releasever/$basearch/' - baseurl: 'http://nginx.org/packages/rhel/{{ nginx.lookup.rh_os_releasever }}/$basearch/'
{%- endif %} {%- endif %}
- gpgcheck: False - gpgcheck: False
- enabled: True - enabled: True

1
nginx/ng/map.jinja
View File

@ -25,6 +25,7 @@
'vhost_enabled': '/etc/nginx/conf.d', 'vhost_enabled': '/etc/nginx/conf.d',
'vhost_use_symlink': False, 'vhost_use_symlink': False,
'pid_file': '/var/run/nginx.pid', 'pid_file': '/var/run/nginx.pid',
'rh_os_releasever': '$releasever',
}, },
'Suse': { 'Suse': {
'package': 'nginx', 'package': 'nginx',

2
pillar.example
View File

@ -35,6 +35,8 @@ 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'
# Source compilation is not currently a part of nginx.ng # Source compilation is not currently a part of nginx.ng
from_source: False from_source: False