Merge branch 'dockerbuild'
This commit is contained in:
commit
e69e8ec24d
1 changed files with 6 additions and 4 deletions
10
nginx.conf
10
nginx.conf
|
@ -1,6 +1,6 @@
|
||||||
worker_processes 1;
|
worker_processes 1;
|
||||||
|
|
||||||
user nobody nogroup;
|
user root nogroup;
|
||||||
pid /tmp/nginx.pid;
|
pid /tmp/nginx.pid;
|
||||||
error_log /tmp/nginx.error.log;
|
error_log /tmp/nginx.error.log;
|
||||||
|
|
||||||
|
@ -17,6 +17,8 @@ http {
|
||||||
access_log /tmp/nginx.access.log combined;
|
access_log /tmp/nginx.access.log combined;
|
||||||
sendfile on;
|
sendfile on;
|
||||||
|
|
||||||
|
root /root/quay/;
|
||||||
|
|
||||||
upstream app_server {
|
upstream app_server {
|
||||||
server unix:/tmp/gunicorn.sock fail_timeout=0;
|
server unix:/tmp/gunicorn.sock fail_timeout=0;
|
||||||
# For a TCP configuration:
|
# For a TCP configuration:
|
||||||
|
@ -37,8 +39,8 @@ http {
|
||||||
keepalive_timeout 5;
|
keepalive_timeout 5;
|
||||||
|
|
||||||
ssl on;
|
ssl on;
|
||||||
ssl_certificate ./certs/quay-unified.cert;
|
ssl_certificate ./certs/quay-staging-unified.cert;
|
||||||
ssl_certificate_key ./certs/quay.key;
|
ssl_certificate_key ./certs/quay-staging.key;
|
||||||
ssl_session_timeout 5m;
|
ssl_session_timeout 5m;
|
||||||
ssl_protocols SSLv3 TLSv1;
|
ssl_protocols SSLv3 TLSv1;
|
||||||
ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
|
ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
|
||||||
|
@ -50,7 +52,7 @@ http {
|
||||||
|
|
||||||
location /static/ {
|
location /static/ {
|
||||||
# checks for static file, if not found proxy to app
|
# checks for static file, if not found proxy to app
|
||||||
alias /home/ubuntu/quay/static/;
|
alias /root/quay/static/;
|
||||||
}
|
}
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
|
|
Reference in a new issue