diff --git a/CHANGELOG.rst b/CHANGELOG.rst new file mode 100644 index 0000000..c4b5736 --- /dev/null +++ b/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`` diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..6812f81 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.0.3 \ No newline at end of file diff --git a/nginx/source.sls b/nginx/source.sls index 5a061d3..9428ad7 100644 --- a/nginx/source.sls +++ b/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 - --http-log-path=/var/log/nginx/access.log - --with-http_dav_module - --http-client-body-temp-path={{ home }}/body - --http-proxy-temp-path={{ home }}/proxy - --with-http_stub_status_module - --http-fastcgi-temp-path={{ home }}/fastcgi - --with-debug - --with-http_ssl_module - {% for name, module in nginx.get('modules', {}) -%} + --lock-path=/var/lock/nginx.lock + --http-log-path=/var/log/nginx/access.log + --with-http_dav_module + --http-client-body-temp-path={{ home }}/body + --http-proxy-temp-path={{ home }}/proxy + --with-http_stub_status_module + --http-fastcgi-temp-path={{ home }}/fastcgi + --with-debug + --with-http_ssl_module + {% for name, module in nginx.get('modules', {}).items() -%} --add-module={{nginx_modules_dir}}/{{name}} \ --with-pcre --with-ipv6 {% endfor %} diff --git a/pillar.example b/pillar.example index 3e90e79..6011d87 100644 --- a/pillar.example +++ b/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