diff options
author | Robert Speicher <robert@gitlab.com> | 2016-04-14 19:34:57 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-04-14 19:34:57 +0000 |
commit | 1f0274e55ec822a9d96da54f73b3d58d91a28a31 (patch) | |
tree | 24f25f089387715741daadd529f403f76124c1f2 /lib | |
parent | 97fd9616ac1cb855d9682c311d8eac8c57479c9f (diff) | |
parent | 2165bbc7853016ea68f36b44ad0590623add7bcf (diff) | |
download | gitlab-ce-1f0274e55ec822a9d96da54f73b3d58d91a28a31.tar.gz |
Merge branch 'remove-ci-nginx-config' into 'master'
Remove deprecated NGINX CI config
[ci skip]
See merge request !3728
Diffstat (limited to 'lib')
-rw-r--r-- | lib/support/nginx/gitlab_ci | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/lib/support/nginx/gitlab_ci b/lib/support/nginx/gitlab_ci deleted file mode 100644 index bf05edfd780..00000000000 --- a/lib/support/nginx/gitlab_ci +++ /dev/null @@ -1,29 +0,0 @@ -# GITLAB CI -server { - listen 80 default_server; # e.g., listen 192.168.1.1:80; - server_name YOUR_CI_SERVER_FQDN; # e.g., server_name source.example.com; - - access_log /var/log/nginx/gitlab_ci_access.log; - error_log /var/log/nginx/gitlab_ci_error.log; - - # expose API to fix runners - location /api { - proxy_read_timeout 300; - proxy_connect_timeout 300; - proxy_redirect off; - proxy_set_header X-Real-IP $remote_addr; - - # You need to specify your DNS servers that are able to resolve YOUR_GITLAB_SERVER_FQDN - resolver 8.8.8.8 8.8.4.4; - proxy_pass $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri; - } - - # redirect all other CI requests - location / { - return 301 $scheme://YOUR_GITLAB_SERVER_FQDN/ci$request_uri; - } - - # adjust this to match the largest build log your runners might submit, - # set to 0 to disable limit - client_max_body_size 10m; -}
\ No newline at end of file |