diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-12-18 17:08:02 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-01-31 22:53:56 +0000 |
| commit | c66b15803a5674a5b97968ae9479b2bd293ca34f (patch) | |
| tree | a6b58be07047576666e5a6fb705f5f555d1fe97f /lib/support | |
| parent | 9c78a206ce2039cdba095c2631538f9e50c28f95 (diff) | |
| download | gitlab-ce-c66b15803a5674a5b97968ae9479b2bd293ca34f.tar.gz | |
Fix confusing implementation detail in nginx config about how gitlab-pages work [ci skip]
Diffstat (limited to 'lib/support')
| -rw-r--r-- | lib/support/nginx/gitlab-pages | 4 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-pages-ssl | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/support/nginx/gitlab-pages b/lib/support/nginx/gitlab-pages index 33f573d0b5b..ed4f7e4316a 100644 --- a/lib/support/nginx/gitlab-pages +++ b/lib/support/nginx/gitlab-pages @@ -14,8 +14,8 @@ server { access_log /var/log/nginx/gitlab_pages_access.log; error_log /var/log/nginx/gitlab_pages_error.log; - # 1. Try to get /project/ to => shared/pages/${group}/public/ or index.html - # 2. Try to get / to => shared/pages/${group}/${host}/public/ or index.html + # 1. Try to get /path/ from shared/pages/${group}/${path}/public/ + # 2. Try to get / from shared/pages/${group}/${host}/public/ location ~ ^/([^/]*)(/.*)?$ { try_files "/$1/public$2" "/$1/public$2/index.html" diff --git a/lib/support/nginx/gitlab-pages-ssl b/lib/support/nginx/gitlab-pages-ssl index 006610262f9..dcbbee4042a 100644 --- a/lib/support/nginx/gitlab-pages-ssl +++ b/lib/support/nginx/gitlab-pages-ssl @@ -53,8 +53,6 @@ server { # ssl_stapling on; # ssl_stapling_verify on; # ssl_trusted_certificate /etc/nginx/ssl/stapling.trusted.crt; - # resolver 208.67.222.222 208.67.222.220 valid=300s; # Can change to your DNS resolver if desired - # resolver_timeout 5s; ## [Optional] Generate a stronger DHE parameter: ## sudo openssl dhparam -out /etc/ssl/certs/dhparam.pem 4096 @@ -65,8 +63,8 @@ server { access_log /var/log/nginx/gitlab_pages_access.log; error_log /var/log/nginx/gitlab_pages_error.log; - # 1. Try to get /project/ to => shared/pages/${group}/public/ or index.html - # 2. Try to get / to => shared/pages/${group}/${host}/public/ or index.html + # 1. Try to get /path/ from shared/pages/${group}/${path}/public/ + # 2. Try to get / from shared/pages/${group}/${host}/public/ location ~ ^/([^/]*)(/.*)?$ { try_files "/$1/public$2" "/$1/public$2/index.html" |