saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed is-nginx-source-modified in the case where you're using a Github tarball as the URL, and it unzips to some freaky directory name instead of a nice name like we expected.

Browse Source
This commit is contained in:
Ross Perkins 2014-11-07 23:24:42 -08:00
parent 2a679f9597
commit da9498bb45
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nginx/source.sls
View File

@ -81,7 +81,7 @@ get-nginx:
- file: {{ nginx_modules_dir }} - file: {{ nginx_modules_dir }}
cmd.wait: cmd.wait:
- cwd: {{ source }} - cwd: {{ source }}
- name: tar -zxf {{ nginx_package }} - name: tar --transform "s,^$(tar --list -zf nginx-{{ version }}.tar.gz | head -n 1),nginx-{{ version }}/," -zxf {{ nginx_package }}
- require: - require:
- pkg: get-nginx - pkg: get-nginx
- file: get-nginx - file: get-nginx
@ -117,12 +117,17 @@ get-ngx_devel_kit:
- file: get-ngx_devel_kit - file: get-ngx_devel_kit
{% endif %} {% endif %}
nginx-source-modified: is-nginx-source-modified:
cmd.run: cmd.run:
- cwd: {{ nginx_source }} - cwd: {{ source }}
- stateful: True - stateful: True
- names: - names:
- m=$(find . \! -name "build.*" -newer {{ sbin_dir }}/nginx -print -quit); - if [ ! -d "nginx-{{ version }}" ]; then
echo "changed=yes comment='Tarball has not yet been extracted'";
exit 0;
fi;
cd "nginx-{{ version }}";
m=$(find . \! -name "build.*" -newer {{ sbin_dir }}/nginx -print -quit);
r=$?; r=$?;
if [ x$r != x0 ]; then if [ x$r != x0 ]; then
echo "changed=yes comment='binary file does not exist or other find error'"; echo "changed=yes comment='binary file does not exist or other find error'";
@ -135,7 +140,7 @@ nginx-source-modified:
echo "changed=no comment='source files are older than binary'" echo "changed=no comment='source files are older than binary'"
{% for name, module in nginx.get('modules', {}).items() -%} {% for name, module in nginx.get('modules', {}).items() -%}
nginx-module-modified-{{name}}: is-nginx-module-modified-{{name}}:
cmd.run: cmd.run:
- cwd: {{ nginx_modules_dir }}/{{name}} - cwd: {{ nginx_modules_dir }}/{{name}}
- stateful: True - stateful: True
@ -196,9 +201,9 @@ nginx:
{% endif %} {% endif %}
- watch: - watch:
- cmd: get-nginx - cmd: get-nginx
- cmd: nginx-source-modified - cmd: is-nginx-source-modified
{% for name, module in nginx.get('modules', {}).items() -%} {% for name, module in nginx.get('modules', {}).items() -%}
- cmd: nginx-module-modified-{{name}} - cmd: is-nginx-module-modified-{{name}}
- file: get-nginx-{{name}} - file: get-nginx-{{name}}
{% endfor %} {% endfor %}
{% if use_sysvinit %} {% if use_sysvinit %}