From 6fe64aba047386da32a6ac0fa4029fbb83ee496a Mon Sep 17 00:00:00 2001
From: rnburn <ryan.burn@gmail.com>
Date: Tue, 24 Oct 2017 13:37:45 -0700
Subject: [PATCH] Set --modules-path.

---
 images/nginx-slim/build.sh           | 6 +-----
 rootfs/etc/nginx/template/nginx.tmpl | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/images/nginx-slim/build.sh b/images/nginx-slim/build.sh
index 946f8b5a1..30da46ef7 100755
--- a/images/nginx-slim/build.sh
+++ b/images/nginx-slim/build.sh
@@ -217,6 +217,7 @@ fi
 ./configure \
   --prefix=/usr/share/nginx \
   --conf-path=/etc/nginx/nginx.conf \
+  --modules-path=/etc/nginx/modules \
   --http-log-path=/var/log/nginx/access.log \
   --error-log-path=/var/log/nginx/error.log \
   --lock-path=/var/lock/nginx.lock \
@@ -238,11 +239,6 @@ fi
   && make || 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..."
 
 cd /
diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
index a3a9cbbee..8219e0e5e 100644
--- a/rootfs/etc/nginx/template/nginx.tmpl
+++ b/rootfs/etc/nginx/template/nginx.tmpl
@@ -12,11 +12,11 @@ load_module /etc/nginx/modules/ngx_http_modsecurity_module.so;
 {{ end }}
 
 {{ if $cfg.EnableOpentracing }}
-load_module modules/ngx_http_opentracing_module.so;
+load_module /etc/nginx/modules/ngx_http_opentracing_module.so;
 {{ end }}
 
 {{ 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 }}
 
 daemon off;