From 1b935c119000352ef641dff1dcb1f914321193af Mon Sep 17 00:00:00 2001
From: Juan Manuel <taishi@taishi-network.net>
Date: Tue, 27 May 2014 20:55:49 -0300
Subject: [PATCH 1/5] Fixed minor typo in nginx.ng.config.sls

---
 nginx/ng/config.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx/ng/config.sls b/nginx/ng/config.sls
index 6a0c2a6..fc3520a 100644
--- a/nginx/ng/config.sls
+++ b/nginx/ng/config.sls
@@ -1,4 +1,4 @@
-# nginx.ng.install
+# nginx.ng.config
 #
 # Manages the main nginx server configuration file.
 

From 5e7b78809e20e24230dd259ab0abb9d3c3d24cc3 Mon Sep 17 00:00:00 2001
From: Jon Chen <bsd@voltaire.sh>
Date: Fri, 30 May 2014 00:52:19 -0400
Subject: [PATCH 2/5] fix link to formula usage instructions

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 2924753..c5d7b36 100644
--- a/README.rst
+++ b/README.rst
@@ -8,7 +8,7 @@ Install nginx either by source or by package.
 
 
     See the full `Salt Formulas installation and usage instructions
-    <http://docs.saltstack.com/topics/conventions/formulas.html>`_.
+    <http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html>`_.
 
 Available states
 ================

From 36b00e6332d075c0e298542daed4418c7555b112 Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Fri, 30 May 2014 19:24:47 +0300
Subject: [PATCH 3/5] Remove useless if statement in source.sls

---
 nginx/source.sls | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nginx/source.sls b/nginx/source.sls
index 9428ad7..bacba90 100644
--- a/nginx/source.sls
+++ b/nginx/source.sls
@@ -79,10 +79,6 @@ get-nginx-{{name}}:
       - cmd: make-nginx
 {% endfor -%}
 
-{% if install_luajit -%}
-
-{% endif -%}
-
 get-ngx_devel_kit:
   file.managed:
     - name: {{ source }}/ngx_devel_kit.tar.gz

From c28cac34839819b467779737e22cb37282bfd322 Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Fri, 30 May 2014 19:28:59 +0300
Subject: [PATCH 4/5] Group source.sls include declarations into one

---
 nginx/source.sls | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/nginx/source.sls b/nginx/source.sls
index bacba90..17b030a 100644
--- a/nginx/source.sls
+++ b/nginx/source.sls
@@ -1,6 +1,3 @@
-include:
-  - nginx.common
-
 {% set nginx = pillar.get('nginx', {}) -%}
 {% set version = nginx.get('version', '1.5.2') -%}
 {% set checksum = nginx.get('checksum', 'sha1=3546be28a72251f8823ab6be6a1180d300d06f76') -%}
@@ -11,13 +8,12 @@ include:
 {% set nginx_home     = home + "/nginx-" + version -%}
 {% set nginx_modules_dir = source + "/nginx-modules" -%}
 
-{% if nginx['with_luajit'] -%}
 include:
+  - nginx.common
+{% if nginx['with_luajit'] %}
   - nginx.luajit2
 {% endif -%}
-
-{% if nginx['with_openresty'] -%}
-include:
+{% if nginx['with_openresty'] %}
   - nginx.openresty
 {% endif -%}
 

From aac18d2505be295ce46b7bb02e7a104fb51b011f Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Fri, 30 May 2014 19:31:00 +0300
Subject: [PATCH 5/5] Correct requisite ID in source.sls

---
 nginx/source.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx/source.sls b/nginx/source.sls
index 17b030a..8995ebc 100644
--- a/nginx/source.sls
+++ b/nginx/source.sls
@@ -72,7 +72,7 @@ get-nginx-{{name}}:
     - watch:
       - file: get-nginx
     - require_in:
-      - cmd: make-nginx
+      - cmd: nginx
 {% endfor -%}
 
 get-ngx_devel_kit: