Merge branch 'master' into dev

1 files changed, 23 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 9188a28..3ce4d87 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ BUILD_DIR=nginx-$(NGX_VERSION)
 
 all: fetch build
 
-fetch: fetch_core pagespeed fetch_dep
+fetch: fetch_core fetch_dep pagespeed
 
 fetch_core:
 	# Downloading source
@@ -36,12 +36,21 @@ fetch_dep:
 	cd $(BUILD_DIR) && git clone https://github.com/alibaba/nginx-http-concat/ 
 	cd $(BUILD_DIR) && git clone https://github.com/zebrafishlabs/nginx-statsd
 	cd $(BUILD_DIR) && git clone https://github.com/newobj/nginx-x-rid-header
+	cd $(BUILD_DIR) && git clone https://github.com/openresty/set-misc-nginx-module
 	cd $(BUILD_DIR) && git clone https://github.com/openresty/redis2-nginx-module
 	cd $(BUILD_DIR) && git clone https://github.com/openresty/set-misc-nginx-module
 	mkdir $(BUILD_DIR)/nginx-syslog && wget -O $(BUILD_DIR)/nginx-syslog/config https://raw.githubusercontent.com/gplessis/dotdeb-nginx/wheezy/debian/modules/nginx-syslog/config 
 
 build:
 	cd $(BUILD_DIR) && ./configure \
+	--with-cc-opt='-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2' \
+	--with-ld-opt='-Wl,-Bsymbolic-functions -Wl,-z,relro' \
+	--lock-path=/var/lock/nginx.lock \
+	--http-client-body-temp-path=/var/lib/nginx/body \
+	--http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
+	--http-proxy-temp-path=/var/lib/nginx/proxy \
+	--http-scgi-temp-path=/var/lib/nginx/scgi \
+	--http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
 	--prefix=/etc/nginx \
 	--sbin-path=/usr/sbin \
 	--conf-path=/etc/nginx/nginx.conf \
@@ -65,6 +74,8 @@ build:
 	--with-http_addition_module \
 	--with-google_perftools_module \
 	--with-http_gunzip_module  \
+	--with-http_random_index_module \
+	--with-http_geoip_module \
 	--add-module=headers-more-nginx-module \
 	--add-module=naxsi/naxsi_src \
 	--add-module=ngx_cache_purge \
@@ -84,6 +95,7 @@ build:
 	--with-cc-opt=-I/usr/include/ossp \
 	--with-ld-opt=-lossp-uuid \
 	--add-module=./nginx-x-rid-header \
+	--add-module=./set-misc-nginx-module \
 	--add-module=./redis2-nginx-module \
 	--add-module=./set-misc-nginx-module \
 	--add-module=./nginx-statsd $(NGX_CONFIGURE)
@@ -99,15 +111,16 @@ clean:
 
 prepare:
 	@(lsb_release -a | grep Debian || ! test -z $(DEBIAN)) || (echo "You don't run Debian, do you? This section is optimized for the Debian GNU/Linux distro.\nOverwrite it with 'DEBIAN=1 make prepare'.\n" && exit 1)
-	dpkg -l | grep build-essential || apt-get install build-essential
-	dpkg -l | grep zlib1g-dev || apt-get install zlib1g-dev
-	dpkg -l | grep -E '^libpcre3$$' || apt-get install libpcre3
-	dpkg -l | grep -E '^libpcre3-dev$$' || apt-get install libpcre3-dev
-	dpkg -l | grep liblua5.1-0-dev || apt-get install liblua5.1-0-dev
-	dpkg -l | grep libossp-uuid-dev || apt-get install libossp-uuid-dev
-	dpkg -l | grep uuid-dev || apt-get install uuid-dev
-	dpkg -l | grep libgoogle-perftools-dev || apt-get install libgoogle-perftools-dev
-	dpkg -l | grep libssl-dev || apt-get install libssl-dev
+	dpkg -l | grep build-essential || apt-get install -y build-essential
+	dpkg -l | grep zlib1g-dev || apt-get install -y zlib1g-dev
+	dpkg -l | grep -E '^libpcre3$$' || apt-get install -y libpcre3
+	dpkg -l | grep -E '^libpcre3-dev$$' || apt-get install -y libpcre3-dev
+	dpkg -l | grep liblua5.1-0-dev || apt-get install -y liblua5.1-0-dev
+	dpkg -l | grep libossp-uuid-dev || apt-get install -y libossp-uuid-dev
+	dpkg -l | grep uuid-dev || apt-get install -y uuid-dev
+	dpkg -l | grep libgoogle-perftools-dev || apt-get install -y libgoogle-perftools-dev
+	dpkg -l | grep libssl-dev || apt-get install -y libssl-dev
+	dpkg -l | grep libgeoip-dev || apt-get install -y libgeoip-dev
 
 pagespeed:
 	@(test -d $(BUILD_DIR)/ngx_pagespeed && cd $(BUILD_DIR)/ngx_pagespeed && \