Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1ce3c34d
Commit
1ce3c34d
authored
Dec 18, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix confusing implementation detail in nginx config about how gitlab-pages work [ci skip]
parent
ba94de28
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
lib/support/nginx/gitlab-pages
lib/support/nginx/gitlab-pages
+2
-2
lib/support/nginx/gitlab-pages-ssl
lib/support/nginx/gitlab-pages-ssl
+2
-4
No files found.
lib/support/nginx/gitlab-pages
View file @
1ce3c34d
...
@@ -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 /p
roject/ to => shared/pages/${group}/public/ or index.html
# 1. Try to get /p
ath/ 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"
...
...
lib/support/nginx/gitlab-pages-ssl
View file @
1ce3c34d
...
@@ -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 /p
roject/ to => shared/pages/${group}/public/ or index.html
# 1. Try to get /p
ath/ 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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment