Use NGINX lookup conf path or fallback

This commit is contained in:
George Robinson 2016-06-05 19:35:35 +01:00
parent 241d8683ed
commit 0dcd4feb28

View File

@ -29,7 +29,7 @@ nginx_download:
nginx_configure: nginx_configure:
cmd.run: cmd.run:
- name: ./configure --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --conf-path=/etc/nginx/nginx.conf {{ nginx.source.opts | join(' ') }} - 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 }} - cwd: /tmp/nginx-{{ nginx.source_version }}
- require: - require:
- archive: nginx_download - archive: nginx_download