Merge pull request #7 from agoragames/fix-iteration-add-changelog-and-version

Fix source module iteration

CHANGELOG.rst

@@ -0,0 +1,9 @@
+=============
+nginx-formula
+=============
+
+0.0.3
+-----
+
+- Using correct iteration method in ``source.sls`` for modules
+- Correct source_hash for ``headers-more`` module in ``pillar.example``

VERSION

@@ -0,0 +1 @@
+0.0.3

nginx/source.sls

@@ -61,7 +61,7 @@ get-nginx:
     - watch:
       - file: get-nginx
 
-{% for name, module in nginx.get('modules', {}) -%}
+{% for name, module in nginx.get('modules', {}).items() -%}
 get-nginx-{{name}}:
   file.managed:
     - name: {{ nginx_modules_dir }}/{{name}}.tar.gz
@@ -71,7 +71,7 @@ get-nginx-{{name}}:
       - file: nginx_user
   cmd.wait:
     - cwd: {{ nginx_home }}
-    - names: 
+    - names:
         - tar -zxf {{ nginx_modules_dir }}/{{name}}.tar.gz -C {{ nginx_modules_dir }}/{{name}}
     - watch:
       - file: get-nginx
@@ -136,16 +136,16 @@ nginx:
         --prefix=/usr/local/nginx
         --error-log-path=/var/log/nginx/error.log
         --pid-path=/var/run/nginx.pid
-        --lock-path=/var/lock/nginx.lock 
+        --lock-path=/var/lock/nginx.lock
-        --http-log-path=/var/log/nginx/access.log 
+        --http-log-path=/var/log/nginx/access.log
-        --with-http_dav_module 
+        --with-http_dav_module
-        --http-client-body-temp-path={{ home }}/body 
+        --http-client-body-temp-path={{ home }}/body
-        --http-proxy-temp-path={{ home }}/proxy 
+        --http-proxy-temp-path={{ home }}/proxy
-        --with-http_stub_status_module 
+        --with-http_stub_status_module
-        --http-fastcgi-temp-path={{ home }}/fastcgi 
+        --http-fastcgi-temp-path={{ home }}/fastcgi
-        --with-debug 
+        --with-debug
-        --with-http_ssl_module 
+        --with-http_ssl_module
-        {% for name, module in nginx.get('modules', {}) -%}
+        {% for name, module in nginx.get('modules', {}).items() -%}
         --add-module={{nginx_modules_dir}}/{{name}} \
         --with-pcre --with-ipv6
         {% endfor %}

pillar.example

@@ -3,6 +3,6 @@ nginx:
   with_luajit: False
   with_openresty: True
   modules:
-    headers-more: 
+    headers-more:
       source: http://github.com/agentzh/headers-more-nginx-module/tarball/v0.21
-      source_hash: sha1=DAFJAKSDFJAKDFJ
+      source_hash: sha1=dbf914cbf3f7b6cb7e033fa7b7c49e2f8879113b