DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set --modules-path.

Browse source
This commit is contained in:
rnburn 2017-10-24 13:37:45 -07:00
parent 45f979e0b7
commit 6fe64aba04
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
images/nginx-slim/build.sh
View file

@ -217,6 +217,7 @@ fi
./configure \ ./configure \
--prefix=/usr/share/nginx \ --prefix=/usr/share/nginx \
--conf-path=/etc/nginx/nginx.conf \ --conf-path=/etc/nginx/nginx.conf \
--modules-path=/etc/nginx/modules \
--http-log-path=/var/log/nginx/access.log \ --http-log-path=/var/log/nginx/access.log \
--error-log-path=/var/log/nginx/error.log \ --error-log-path=/var/log/nginx/error.log \
--lock-path=/var/lock/nginx.lock \ --lock-path=/var/lock/nginx.lock \
@ -238,11 +239,6 @@ fi
&& make || exit 1 \ && make || exit 1 \
&& make install || exit 1 && make install || exit 1
if [[ ${ARCH} == "x86_64" ]]; then
mkdir -p /etc/nginx/modules/
cp objs/ngx_http_modsecurity_module.so /etc/nginx/modules/
fi
echo "Cleaning..." echo "Cleaning..."
cd / cd /

4
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -12,11 +12,11 @@ load_module /etc/nginx/modules/ngx_http_modsecurity_module.so;
{{ end }} {{ end }}
{{ if $cfg.EnableOpentracing }} {{ if $cfg.EnableOpentracing }}
load_module modules/ngx_http_opentracing_module.so; load_module /etc/nginx/modules/ngx_http_opentracing_module.so;
{{ end }} {{ end }}
{{ if (and $cfg.EnableOpentracing (ne $cfg.ZipkinCollectorHost "")) }} {{ if (and $cfg.EnableOpentracing (ne $cfg.ZipkinCollectorHost "")) }}
load_module modules/ngx_http_zipkin_module.so; load_module /etc/nginx/modules/ngx_http_zipkin_module.so;
{{ end }} {{ end }}
daemon off; daemon off;