From b615c47a7aaf65db37b4aade1174c1cc454da558 Mon Sep 17 00:00:00 2001 From: mkasimd <49522425+mkasimd@users.noreply.github.com> Date: Mon, 13 May 2019 15:12:40 +0000 Subject: [PATCH] adding modules and changing rules accordingly --- .gitmodules | 5 ++--- debian/rules | 2 +- modules | 1 + src/modules | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) create mode 160000 modules delete mode 160000 src/modules diff --git a/.gitmodules b/.gitmodules index eb727f8..c4c631d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,3 @@ -[submodule "src/modules"] - path = src/modules +[submodule "modules"] + path = modules url = https://github.com/mkasimd/nginx-modules.git - branch = master diff --git a/debian/rules b/debian/rules index 4389d2e..2043375 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ config.env.%: config.status.nginx: config.env.nginx cd $(BUILDDIR_nginx) && \ - CFLAGS="" ./configure --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/lib/nginx/modules \ + CFLAGS="" ./configure --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/local/src/debian-nginx/modules \ --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log \ --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock --http-client-body-temp-path=/var/cache/nginx/client_temp \ --http-proxy-temp-path=/var/cache/nginx/proxy_temp --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \ diff --git a/modules b/modules new file mode 160000 index 0000000..5d33461 --- /dev/null +++ b/modules @@ -0,0 +1 @@ +Subproject commit 5d33461c5ded0ade1cc1786b4fddeac2312ec2ab diff --git a/src/modules b/src/modules deleted file mode 160000 index e6f9cb1..0000000 --- a/src/modules +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e6f9cb12aabf4846acec2fbdbdf462de974a3d8a