diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-24 23:24:06 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-24 23:24:06 +0000 |
| commit | 309a3f147703a5bdbb5026f9f55d8fd83326074a (patch) | |
| tree | 805114dfc8c65f029cfccca6559ca6438027f8dd | |
| parent | d1148002416d1b5a21ebf7fdf2a71b201743033a (diff) | |
| parent | 23f705f2d0f10ed765929afa923ee096d9f0e136 (diff) | |
| download | gitlab-ce-309a3f147703a5bdbb5026f9f55d8fd83326074a.tar.gz | |
Merge branch 'fix-gitlab-registry-ssl-redirect' into 'master'
Fix: redirect non-SSL request for gitlab registry to valid URL
See merge request gitlab-org/gitlab-ce!20824
| -rw-r--r-- | lib/support/nginx/registry-ssl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/support/nginx/registry-ssl b/lib/support/nginx/registry-ssl index 92511e26861..908d26a0da2 100644 --- a/lib/support/nginx/registry-ssl +++ b/lib/support/nginx/registry-ssl @@ -10,7 +10,7 @@ server { listen *:80; server_name registry.gitlab.example.com; server_tokens off; ## Don't show the nginx version number, a security best practice - return 301 https://$http_host:$request_uri; + return 301 https://$http_host$request_uri; access_log /var/log/nginx/gitlab_registry_access.log gitlab_access; error_log /var/log/nginx/gitlab_registry_error.log; } |