Merge branch 'master' of https://github.com/saltstack-formulas/nginx-formula

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

nginx/ng/config.sls

@@ -1,4 +1,4 @@
-# nginx.ng.install
+# nginx.ng.config
 #
 # Manages the main nginx server configuration file.
 

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 -%}
 
@@ -76,13 +72,9 @@ get-nginx-{{name}}:
     - watch:
       - file: get-nginx
     - require_in:
-      - cmd: make-nginx
+      - cmd: nginx
 {% endfor -%}
 
-{% if install_luajit -%}
-
-{% endif -%}
-
 get-ngx_devel_kit:
   file.managed:
     - name: {{ source }}/ngx_devel_kit.tar.gz