Merge pull request #84 from rbang1/master

Fix for incorrect pkg repo base url on Amazon Linux on EC2

nginx/ng/install.sls

@@ -57,7 +57,7 @@ nginx_yum_repo:
     {%- if salt['grains.get']('os') == 'CentOS' %}
     - baseurl: 'http://nginx.org/packages/centos/$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

nginx/ng/map.jinja

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

pillar.example

@@ -35,6 +35,8 @@ nginx:
       vhost_available: /etc/nginx/sites-available
       vhost_enabled: /etc/nginx/sites-enabled
       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
     from_source: False