road to multi server block support

confs/global/nginx.conf

@@ -80,9 +80,6 @@ http {
 	# resolvers to use
 	resolver %DNS_RESOLVERS% ipv6=off;
 
-	# get real IP address if behind a reverse proxy
-        %PROXY_REAL_IP%
-
 	# lua path and dicts
 	lua_package_path "/usr/local/lib/lua/?.lua;;";
 	%WHITELIST_IP_CACHE%
@@ -97,18 +94,15 @@ http {
 	# shared memory zone for limit_req
 	%LIMIT_REQ_ZONE%
 
-	# server config
-	include /etc/nginx/server.conf;
-
 	# list of blocked country
 	%BLOCK_COUNTRY%
 
 	# list of blocker user agents
 	%BLOCK_USER_AGENT%
 
-	# enable/disable ModSecurity
-	%USE_MODSECURITY%
-
 	# custom http confs
 	include /http-confs/*.conf;
+
+	# server config(s)
+	%INCLUDE_SERVER%
 }

confs/site/server.conf

@@ -1,6 +1,8 @@
 server {
 	include /server-confs/*.conf;
 	include /etc/nginx/main-lua.conf;
+	%PROXY_REAL_IP%
+	%USE_MODSECURITY%
 	%LISTEN_HTTP%
 	%USE_HTTPS%
 	%REDIRECT_HTTP_TO_HTTPS%