Fixing Travis - Last Try for Tonight - Getting Closer

This commit is contained in:
Mitchell Krog 2017-02-07 18:21:32 +02:00
parent 38dd539fbe
commit 24771d2c51
3 changed files with 23 additions and 25 deletions

View file

@ -4,7 +4,7 @@ hhvm.server.type = fastcgi
;hhvm.server.file_socket = {SERVER} ;hhvm.server.file_socket = {SERVER}
hhvm.server.port = {PORT} hhvm.server.port = {PORT}
hhvm.log.use_log_file = true hhvm.log.use_log_file = true
hhvm.log.file = {DIR}/tmp/error.log hhvm.log.file = /tmp/error.log
hhvm.log.level = Warning hhvm.log.level = Warning
hhvm.log.always_log_unhandled_exceptions = true hhvm.log.always_log_unhandled_exceptions = true
hhvm.log.runtime_error_reporting_level = 8191 hhvm.log.runtime_error_reporting_level = 8191

View file

@ -26,8 +26,8 @@ mkdir "$DIR/nginx"
mkdir "$DIR/nginx/sites-enabled" mkdir "$DIR/nginx/sites-enabled"
mkdir "$DIR/var" mkdir "$DIR/var"
mkdir "$DIR/nginx/bots.d" mkdir "$DIR/nginx/bots.d"
mkdir "$DIR/nginx/conf.d" #mkdir "$DIR/nginx/conf.d"
mkdir "$DIR/tmp" #mkdir "$DIR/tmp"
# Configure the PHP handler. # Configure the PHP handler.
if [ "$PHP_VERSION" = 'hhvm' ] || [ "$PHP_VERSION" = 'hhvm-nightly' ] if [ "$PHP_VERSION" = 'hhvm' ] || [ "$PHP_VERSION" = 'hhvm-nightly' ]
@ -61,5 +61,4 @@ tpl "$DIR/blockbots.tpl.conf" "$DIR/nginx/bots.d/blockbots.conf"
tpl "$DIR/ddos.tpl.conf" "$DIR/nginx/bots.d/ddos.conf" tpl "$DIR/ddos.tpl.conf" "$DIR/nginx/bots.d/ddos.conf"
# Start nginx. # Start nginx.
nginx -p . -g 'error_log error.log;'
nginx -c "$DIR/nginx/nginx.conf" nginx -c "$DIR/nginx/nginx.conf"

View file

@ -1,6 +1,6 @@
error_log /tmp/error.log;
pid /tmp/nginx.pid;
worker_processes 1; worker_processes 1;
pid pid {DIR}/tmp/nginx.pid;
events { events {
worker_connections 1024; worker_connections 1024;
} }
@ -16,19 +16,16 @@ http {
## ##
# Basic Settings # Basic Settings
## ##
sendfile on; sendfile on;
tcp_nopush on; tcp_nopush on;
tcp_nodelay on; tcp_nodelay on;
keepalive_timeout 90s; keepalive_timeout 65;
keepalive_requests 1000; types_hash_max_size 2048;
server_tokens off; # server_tokens off;
client_body_buffer_size 32k; # server_names_hash_bucket_size 64;
client_header_buffer_size 1k; # server_name_in_redirect off;
client_max_body_size 50M; include /etc/nginx/mime.types;
types_hash_max_size 2048; default_type application/octet-stream;
server_names_hash_bucket_size 64;
server_names_hash_max_size 4096;
large_client_header_buffers 4 16k;
# Our request limiter zone for wp-login attacks - for later use in Travis # Our request limiter zone for wp-login attacks - for later use in Travis
#limit_req_zone $binary_remote_addr zone=wp-login:10m rate=1r/s; #limit_req_zone $binary_remote_addr zone=wp-login:10m rate=1r/s;
@ -42,16 +39,18 @@ http {
limit_conn_zone $ratelimited zone=addr:50m; limit_conn_zone $ratelimited zone=addr:50m;
# server_name_in_redirect off;
include /etc/nginx/mime.types;
default_type application/octet-stream;
## ##
# Logging Settings # Logging Settings
## ##
access_log {DIR}/tmp/access.log; access_log /tmp/access.log;
error_log {DIR}/tmp/error.log; error_log /tmp/error.log;
##
# Gzip Settings
##
gzip on;
gzip_disable "msie6";
## ##
# Virtual Host Configs # Virtual Host Configs
## ##