Merge branch 'dockerbuild'

This commit is contained in:
root 2013-10-30 22:53:55 +00:00
commit e69e8ec24d

View file

@ -1,6 +1,6 @@
worker_processes 1;
user nobody nogroup;
user root nogroup;
pid /tmp/nginx.pid;
error_log /tmp/nginx.error.log;
@ -17,6 +17,8 @@ http {
access_log /tmp/nginx.access.log combined;
sendfile on;
root /root/quay/;
upstream app_server {
server unix:/tmp/gunicorn.sock fail_timeout=0;
# For a TCP configuration:
@ -37,8 +39,8 @@ http {
keepalive_timeout 5;
ssl on;
ssl_certificate ./certs/quay-unified.cert;
ssl_certificate_key ./certs/quay.key;
ssl_certificate ./certs/quay-staging-unified.cert;
ssl_certificate_key ./certs/quay-staging.key;
ssl_session_timeout 5m;
ssl_protocols SSLv3 TLSv1;
ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
@ -50,7 +52,7 @@ http {
location /static/ {
# checks for static file, if not found proxy to app
alias /home/ubuntu/quay/static/;
alias /root/quay/static/;
}
location / {