From 997ef47905fe26ada1d2d46fa91280f4e4f575f8 Mon Sep 17 00:00:00 2001
From: Roshan Bangera <roshan@mashable.com>
Date: Wed, 13 May 2015 19:00:12 -0500
Subject: [PATCH 1/4]  * added pillar variable to specify os release version
 for nginx package repo base url for RedHat family os hosts

---
 nginx/ng/install.sls | 4 ++--
 nginx/ng/map.jinja   | 1 +
 pillar.example       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nginx/ng/install.sls b/nginx/ng/install.sls
index 8de42dd..43a0839 100644
--- a/nginx/ng/install.sls
+++ b/nginx/ng/install.sls
@@ -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
diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja
index 4d67e1f..ea0ddc5 100644
--- a/nginx/ng/map.jinja
+++ b/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',
diff --git a/pillar.example b/pillar.example
index 109225b..60b8a51 100644
--- a/pillar.example
+++ b/pillar.example
@@ -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

From 03c4902b9e2a7c2b3d47306b16867996b99aeff7 Mon Sep 17 00:00:00 2001
From: Roshan Bangera <roshan@mashable.com>
Date: Sun, 17 May 2015 10:23:01 -0500
Subject: [PATCH 2/4]  * added comment for pillar example  * removed override
 releasever variable use for CentOS

---
 nginx/ng/install.sls | 2 +-
 pillar.example       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nginx/ng/install.sls b/nginx/ng/install.sls
index 43a0839..99a84dd 100644
--- a/nginx/ng/install.sls
+++ b/nginx/ng/install.sls
@@ -55,7 +55,7 @@ nginx_yum_repo:
     - name: nginx
     - humanname: nginx repo
     {%- 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 %}
     - baseurl: 'http://nginx.org/packages/rhel/{{ nginx.lookup.rh_os_releasever }}/$basearch/'
     {%- endif %}
diff --git a/pillar.example b/pillar.example
index 60b8a51..beb765d 100644
--- a/pillar.example
+++ b/pillar.example
@@ -35,6 +35,7 @@ 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 62ab6a95029fe96a217727dd58ec4494902a2c00 Mon Sep 17 00:00:00 2001
From: Roshan Bangera <roshan@mashable.com>
Date: Wed, 13 May 2015 19:00:12 -0500
Subject: [PATCH 3/4]  * added pillar variable to specify os release version
 for nginx package repo base url for RedHat family os hosts

 * added comment for pillar example
 * removed override releasever variable use for CentOS
---
 nginx/ng/map.jinja | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja
index ea0ddc5..62f9700 100644
--- a/nginx/ng/map.jinja
+++ b/nginx/ng/map.jinja
@@ -24,7 +24,10 @@
             'vhost_available': '/etc/nginx/conf.d',
             'vhost_enabled': '/etc/nginx/conf.d',
             'vhost_use_symlink': False,
+<<<<<<< HEAD
             'pid_file': '/var/run/nginx.pid',
+=======
+>>>>>>>  * added pillar variable to specify os release version for nginx package repo base url for RedHat family os hosts
             'rh_os_releasever': '$releasever',
         },
         'Suse': {

From afea3d245edf775a9f9c0a653afaa5214293a827 Mon Sep 17 00:00:00 2001
From: Roshan Bangera <roshan@mashable.com>
Date: Tue, 30 Jun 2015 20:02:15 -0700
Subject: [PATCH 4/4]  * fixed previous commit

---
 nginx/ng/map.jinja | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja
index 62f9700..ea0ddc5 100644
--- a/nginx/ng/map.jinja
+++ b/nginx/ng/map.jinja
@@ -24,10 +24,7 @@
             'vhost_available': '/etc/nginx/conf.d',
             'vhost_enabled': '/etc/nginx/conf.d',
             'vhost_use_symlink': False,
-<<<<<<< HEAD
             'pid_file': '/var/run/nginx.pid',
-=======
->>>>>>>  * added pillar variable to specify os release version for nginx package repo base url for RedHat family os hosts
             'rh_os_releasever': '$releasever',
         },
         'Suse': {