From 0b5b14db9356c35008e2d9e16616be53b08d522d Mon Sep 17 00:00:00 2001 From: Horus3 Date: Mon, 23 Mar 2015 14:44:31 +0100 Subject: Add geoip_module and standard config options. --- Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Makefile b/Makefile index 51920bc..d85f37b 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,14 @@ fetch_dep: 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 \ @@ -64,6 +72,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 \ @@ -106,6 +116,7 @@ prepare: 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 libgeoip-dev || apt-get install libgeoip-dev pagespeed: @(test -d $(BUILD_DIR)/ngx_pagespeed && cd $(BUILD_DIR)/ngx_pagespeed && \ -- cgit v1.2.3 From 8bdd45de2422c96531deead3ef8ccac36f544b16 Mon Sep 17 00:00:00 2001 From: Horus3 Date: Wed, 8 Apr 2015 01:18:18 +0200 Subject: Add module 'set-misc-nginx' and change order of 'fetch' target. --- Makefile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index d85f37b..2d087e7 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,6 +36,7 @@ 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 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 @@ -93,6 +94,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=./nginx-statsd $(NGX_CONFIGURE) cd $(BUILD_DIR)/ && \ @@ -107,16 +109,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 libgeoip-dev || apt-get install libgeoip-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 && \ -- cgit v1.2.3