Fix source module iteration

* Fixing iteration for building nginx by source with respect
  to modules
* Adding `CHANGELOG.rst` and `VERSION` per https://groups.google.com/forum/#!topic/salt-users/zHguqsk-mds
This commit is contained in:
David Czarnecki 2013-09-27 14:59:01 -04:00
parent 17d1fef1c7
commit 6a1becff4a
4 changed files with 24 additions and 14 deletions

9
CHANGELOG.rst Normal file
View File

@ -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``

1
VERSION Normal file
View File

@ -0,0 +1 @@
0.0.3

View File

@ -61,7 +61,7 @@ get-nginx:
- watch: - watch:
- file: get-nginx - file: get-nginx
{% for name, module in nginx.get('modules', {}) -%} {% for name, module in nginx.get('modules', {}).items() -%}
get-nginx-{{name}}: get-nginx-{{name}}:
file.managed: file.managed:
- name: {{ nginx_modules_dir }}/{{name}}.tar.gz - name: {{ nginx_modules_dir }}/{{name}}.tar.gz
@ -71,7 +71,7 @@ get-nginx-{{name}}:
- file: nginx_user - file: nginx_user
cmd.wait: cmd.wait:
- cwd: {{ nginx_home }} - cwd: {{ nginx_home }}
- names: - names:
- tar -zxf {{ nginx_modules_dir }}/{{name}}.tar.gz -C {{ nginx_modules_dir }}/{{name}} - tar -zxf {{ nginx_modules_dir }}/{{name}}.tar.gz -C {{ nginx_modules_dir }}/{{name}}
- watch: - watch:
- file: get-nginx - file: get-nginx
@ -136,16 +136,16 @@ nginx:
--prefix=/usr/local/nginx --prefix=/usr/local/nginx
--error-log-path=/var/log/nginx/error.log --error-log-path=/var/log/nginx/error.log
--pid-path=/var/run/nginx.pid --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}} \ --add-module={{nginx_modules_dir}}/{{name}} \
--with-pcre --with-ipv6 --with-pcre --with-ipv6
{% endfor %} {% endfor %}

View File

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