diff options
author | Francisco Redondo <francisco.marchena@codethink.co.uk> | 2015-03-18 12:44:52 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@baserock.org> | 2015-03-18 12:44:52 +0000 |
commit | 369a6c5211d60313c88ad4c403cfc1b1f0cd817d (patch) | |
tree | 1fa6e9ca64f48d4ebf58e610d86550f11738c831 /gitlab-server/usr/share/gitlab-install/nginx.conf | |
parent | ad252c62599cf25c78b6b82448e31847fe880a66 (diff) | |
parent | 24673741fb1ad30c273e89c25d366e0136dfaa5b (diff) | |
download | definitions-369a6c5211d60313c88ad4c403cfc1b1f0cd817d.tar.gz |
Merge "Remove Gitlab systems"
Diffstat (limited to 'gitlab-server/usr/share/gitlab-install/nginx.conf')
-rw-r--r-- | gitlab-server/usr/share/gitlab-install/nginx.conf | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/gitlab-server/usr/share/gitlab-install/nginx.conf b/gitlab-server/usr/share/gitlab-install/nginx.conf deleted file mode 100644 index 6e40b0e9..00000000 --- a/gitlab-server/usr/share/gitlab-install/nginx.conf +++ /dev/null @@ -1,73 +0,0 @@ - -#user nobody; -worker_processes 1; - -#error_log logs/error.log; -#error_log logs/error.log notice; -#error_log logs/error.log info; - -#pid logs/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include mime.types; - default_type application/octet-stream; - - #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - # '$status $body_bytes_sent "$http_referer" ' - # '"$http_user_agent" "$http_x_forwarded_for"'; - - #access_log logs/access.log main; - - sendfile on; - #tcp_nopush on; - - #keepalive_timeout 0; - keepalive_timeout 65; - - #gzip on; - - include /home/git/gitlab/lib/support/nginx/gitlab; - include /home/gitlab_ci/gitlab-ci/lib/support/nginx/gitlab_ci; - - # another virtual host using mix of IP-, name-, and port-based configuration - # - #server { - # listen 8000; - # listen somename:8080; - # server_name somename alias another.alias; - - # location / { - # root html; - # index index.html index.htm; - # } - #} - - - # HTTPS server - # - #server { - # listen 443 ssl; - # server_name localhost; - - # ssl_certificate cert.pem; - # ssl_certificate_key cert.key; - - # ssl_session_cache shared:SSL:1m; - # ssl_session_timeout 5m; - - # ssl_ciphers HIGH:!aNULL:!MD5; - # ssl_prefer_server_ciphers on; - - # location / { - # root html; - # index index.html index.htm; - # } - #} - -} |