merge upstream & update configs

This commit is contained in:
Mihai Pitu
2013-08-23 13:54:30 +03:00
parent 107ff9af8f
commit 9651da3d4c
192 changed files with 14497 additions and 439 deletions

View File

View File

@@ -0,0 +1,22 @@
user root;
worker_processes 1;
daemon on;
error_log logs/error.log debug;
events {
worker_connections 1024;
}
http {
ModSecurityEnabled [% enable %];
ModSecurityConfig [% config %];
server {
listen [% listen %];
server_name localhost;
location / {
}
}
}