vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

reset nginx config to master

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-01-21 17:00:43 -05:00
parent 0f8aad9ef1
commit e93d0b83ec
3 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
conf/hosted-http-base.conf
View file

@ -3,15 +3,5 @@
server { server {
listen 80 default_server; listen 80 default_server;
server_name _; server_name _;
set_real_ip_from 10.0.0.0/8;
real_ip_header proxy_protocol;
log_format elb '$proxy_protocol_addr - $remote_user [$time_local] '
'"$request" $status $body_bytes_sent '
'"$http_referer" "$http_user_agent"';
access_log /var/log/nginx/nginx.access.log elb;
rewrite ^ https://$host$request_uri? permanent; rewrite ^ https://$host$request_uri? permanent;
} }

16
conf/nginx.conf
View file

@ -12,7 +12,7 @@ http {
server { server {
include server-base.conf; include server-base.conf;
listen 443 default proxy_protocol; listen 443 default;
ssl on; ssl on;
ssl_certificate ./stack/ssl.cert; ssl_certificate ./stack/ssl.cert;
@ -22,18 +22,4 @@ http {
ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP; ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
ssl_prefer_server_ciphers on; ssl_prefer_server_ciphers on;
} }
server {
include server-base.conf
listen 444 default;
ssl on;
ssl_certificate ./stack/ssl.cert;
ssl_certificate_key ./stack/ssl.key;
ssl_session_timeout 5m;
ssl_protocols SSLv3 TLSv1;
ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
ssl_prefer_server_ciphers on;
}
} }

1
conf/server-base.conf
View file

@ -5,7 +5,6 @@ server_name _;
set_real_ip_from 172.17.0.0/16; set_real_ip_from 172.17.0.0/16;
real_ip_header X-Forwarded-For; real_ip_header X-Forwarded-For;
real_ip_recursive on;
keepalive_timeout 5; keepalive_timeout 5;