Merge pull request #128 from ghost/master

Fix build deps for NGINX NG build from source

nginx/ng/src.sls

@@ -4,16 +4,12 @@
 
 {% from 'nginx/ng/map.jinja' import nginx, sls_block with context %}
 
-nginx_build_dep:
+nginx_deps:
-  {% if salt['grains.get']('os_family') == 'Debian' %}
+  pkg.installed:
-  cmd.run:
+    - pkgs:
-    - name: apt-get -y build-dep nginx
+      - libpcre3-dev
-  {% elif salt['grains.get']('os_family') == 'RedHat' %}
+      - libssl-dev
-  cmd.run:
+      - zlib1g-dev
-    - name: yum-builddep -y nginx
-  {% else %}
-  ## install build deps for other distros
-  {% endif %}
 
 nginx_download:
   archive.extracted:
@@ -23,16 +19,12 @@ nginx_download:
     - archive_format: tar
     - if_missing: /usr/sbin/nginx-{{ nginx.source_version }}
     - require:
-      - cmd: nginx_build_dep
+      - pkg: nginx_deps
-    - onchanges:
-      - cmd: nginx_build_dep
 
 nginx_configure:
   cmd.run:
     - name: ./configure --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --conf-path={{ nginx.lookup.conf_file or '/etc/nginx/nginx.conf' }} {{ nginx.source.opts | join(' ') }}
     - cwd: /tmp/nginx-{{ nginx.source_version }}
-    - require:
-      - archive: nginx_download
     - onchanges:
       - archive: nginx_download
 
@@ -40,8 +32,6 @@ nginx_compile:
   cmd.run:
     - name: make
     - cwd: /tmp/nginx-{{ nginx.source_version }}
-    - require:
-      - cmd: nginx_configure
     - onchanges:
       - cmd: nginx_configure
 
@@ -49,8 +39,6 @@ nginx_install:
   cmd.run:
     - name: make install
     - cwd: /tmp/nginx-{{ nginx.source_version }}
-    - require:
-      - cmd: nginx_compile
     - onchanges:
       - cmd: nginx_compile
 
@@ -58,7 +46,5 @@ nginx_link:
   file.copy:
     - name: /usr/sbin/nginx-{{ nginx.source_version }}
     - source: /usr/sbin/nginx
-    - require:
-      - cmd: nginx_install
     - onchanges:
       - cmd: nginx_install