Commit c66b1580 authored by Kamil Trzcinski's avatar Kamil Trzcinski Committed by James Edwards-Jones

Fix confusing implementation detail in nginx config about how gitlab-pages work [ci skip]

parent 9c78a206
...@@ -14,8 +14,8 @@ server { ...@@ -14,8 +14,8 @@ server {
access_log /var/log/nginx/gitlab_pages_access.log; access_log /var/log/nginx/gitlab_pages_access.log;
error_log /var/log/nginx/gitlab_pages_error.log; error_log /var/log/nginx/gitlab_pages_error.log;
# 1. Try to get /project/ to => shared/pages/${group}/public/ or index.html # 1. Try to get /path/ from shared/pages/${group}/${path}/public/
# 2. Try to get / to => shared/pages/${group}/${host}/public/ or index.html # 2. Try to get / from shared/pages/${group}/${host}/public/
location ~ ^/([^/]*)(/.*)?$ { location ~ ^/([^/]*)(/.*)?$ {
try_files "/$1/public$2" try_files "/$1/public$2"
"/$1/public$2/index.html" "/$1/public$2/index.html"
......
...@@ -53,8 +53,6 @@ server { ...@@ -53,8 +53,6 @@ server {
# ssl_stapling on; # ssl_stapling on;
# ssl_stapling_verify on; # ssl_stapling_verify on;
# ssl_trusted_certificate /etc/nginx/ssl/stapling.trusted.crt; # 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: ## [Optional] Generate a stronger DHE parameter:
## sudo openssl dhparam -out /etc/ssl/certs/dhparam.pem 4096 ## sudo openssl dhparam -out /etc/ssl/certs/dhparam.pem 4096
...@@ -65,8 +63,8 @@ server { ...@@ -65,8 +63,8 @@ server {
access_log /var/log/nginx/gitlab_pages_access.log; access_log /var/log/nginx/gitlab_pages_access.log;
error_log /var/log/nginx/gitlab_pages_error.log; error_log /var/log/nginx/gitlab_pages_error.log;
# 1. Try to get /project/ to => shared/pages/${group}/public/ or index.html # 1. Try to get /path/ from shared/pages/${group}/${path}/public/
# 2. Try to get / to => shared/pages/${group}/${host}/public/ or index.html # 2. Try to get / from shared/pages/${group}/${host}/public/
location ~ ^/([^/]*)(/.*)?$ { location ~ ^/([^/]*)(/.*)?$ {
try_files "/$1/public$2" try_files "/$1/public$2"
"/$1/public$2/index.html" "/$1/public$2/index.html"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment