diff options
| -rw-r--r-- | app/models/project.rb | 14 | ||||
| -rw-r--r-- | app/workers/pages_worker.rb | 4 | ||||
| -rw-r--r-- | doc/pages/administration.md | 12 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-pages | 11 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-pages-ssl | 80 |
5 files changed, 98 insertions, 23 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index a1888c089ce..9cdd01e433d 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1137,6 +1137,7 @@ class Project < ActiveRecord::Base issues.opened.count end +<<<<<<< HEAD def visibility_level_allowed_as_fork?(level = self.visibility_level) return true unless forked? @@ -1162,22 +1163,23 @@ class Project < ActiveRecord::Base ensure_runners_token! end + def pages_host + "#{namespace.path}.#{Settings.pages.host}" + end + def pages_url if Dir.exist?(public_pages_path) - host = "#{namespace.path}.#{Settings.pages.host}" - url = Gitlab.config.pages.url.sub(/^https?:\/\//) do |prefix| - "#{prefix}#{namespace.path}." - end + url = Gitlab.config.pages.url.sub(Settings.pages.host, pages_host) # If the project path is the same as host, leave the short version - return url if host == path + return url if pages_host == path "#{url}/#{path}" end end def pages_path - File.join(Settings.pages.path, path_with_namespace) + File.join(Settings.pages.path, pages_host, path) end def public_pages_path diff --git a/app/workers/pages_worker.rb b/app/workers/pages_worker.rb index 6c6bb7ed13f..836e8d8ad9d 100644 --- a/app/workers/pages_worker.rb +++ b/app/workers/pages_worker.rb @@ -121,10 +121,6 @@ class PagesWorker @previous_public_path ||= File.join(pages_path, "public.#{SecureRandom.hex}") end - def lock_path - @lock_path ||= File.join(pages_path, 'deploy.lock') - end - def ref build.ref end diff --git a/doc/pages/administration.md b/doc/pages/administration.md index 6e242efae9f..28e975e5621 100644 --- a/doc/pages/administration.md +++ b/doc/pages/administration.md @@ -74,22 +74,16 @@ See the relevant documentation at <http://doc.gitlab.com/omnibus/settings/pages. your GitLab pages domain is `gitlabpages.com`, replace ```bash - server_name ~^(?<group>.*)\.YOUR_GITLAB_PAGES\.DOMAIN$; + server_name *.YOUR_GITLAB_PAGES.DOMAIN; ``` with ``` - server_name ~^(?<group>.*)\.gitlabpages\.com$; + server_name *.gitlabpages.com; ``` - You must be extra careful to not remove the backslashes. If you are using - a subdomain, make sure to escape all dots (`.`) with a backslash (\). - For example `pages.gitlab.io` would be: - - ``` - server_name ~^(?<group>.*)\.pages\.gitlab\.io$; - ``` + You must be add `*` in front of your domain, this is required to catch all subdomains of gitlabpages.com. 1. Restart Nginx and GitLab: diff --git a/lib/support/nginx/gitlab-pages b/lib/support/nginx/gitlab-pages index 0eeb0cd1917..6300c268521 100644 --- a/lib/support/nginx/gitlab-pages +++ b/lib/support/nginx/gitlab-pages @@ -1,18 +1,21 @@ +## GitLab +## + ## Pages serving host server { listen 0.0.0.0:80; listen [::]:80 ipv6only=on; ## Replace this with something like pages.gitlab.com - server_name ~^(?<group>.*)\.YOUR_GITLAB_PAGES\.DOMAIN$; - root /home/git/gitlab/shared/pages/${group}; + server_name *.YOUR_GITLAB_PAGES.DOMAIN; + root /home/git/gitlab/shared/pages/${host}; ## Individual nginx logs for GitLab pages 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 /project/ from => shared/pages/${host}/${project}/public/ + # 2. Try to get / from => shared/pages/${host}/${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 new file mode 100644 index 00000000000..d3e8379ed29 --- /dev/null +++ b/lib/support/nginx/gitlab-pages-ssl @@ -0,0 +1,80 @@ +## GitLab +## + +## Redirects all HTTP traffic to the HTTPS host +server { + ## Either remove "default_server" from the listen line below, + ## or delete the /etc/nginx/sites-enabled/default file. This will cause gitlab + ## to be served if you visit any address that your server responds to, eg. + ## the ip address of the server (http://x.x.x.x/) + listen 0.0.0.0:80; + listen [::]:80 ipv6only=on; + + server_name *.YOUR_GITLAB_PAGES.DOMAIN; + server_tokens off; ## Don't show the nginx version number, a security best practice + + return 301 https://$http_host$request_uri; + + access_log /var/log/nginx/gitlab_pages_access.log; + error_log /var/log/nginx/gitlab_pages_access.log; +} + +## Pages serving host +server { + listen 0.0.0.0:443 ssl; + listen [::]:443 ipv6only=on ssl; + + ## Replace this with something like pages.gitlab.com + server_name *.YOUR_GITLAB_PAGES.DOMAIN; + server_tokens off; ## Don't show the nginx version number, a security best practice + root /home/git/gitlab/shared/pages/${host}; + + ## Strong SSL Security + ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/ + ssl on; + ssl_certificate /etc/nginx/ssl/gitlab-pages.crt; + ssl_certificate_key /etc/nginx/ssl/gitlab-pages.key; + + # GitLab needs backwards compatible ciphers to retain compatibility with Java IDEs + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_session_cache shared:SSL:10m; + ssl_session_timeout 5m; + + ## See app/controllers/application_controller.rb for headers set + + ## [Optional] If your certficate has OCSP, enable OCSP stapling to reduce the overhead and latency of running SSL. + ## Replace with your ssl_trusted_certificate. For more info see: + ## - https://medium.com/devops-programming/4445f4862461 + ## - https://www.ruby-forum.com/topic/4419319 + ## - https://www.digitalocean.com/community/tutorials/how-to-configure-ocsp-stapling-on-apache-and-nginx + # 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 + ## + # ssl_dhparam /etc/ssl/certs/dhparam.pem; + + ## Individual nginx logs for GitLab pages + access_log /var/log/nginx/gitlab_pages_access.log; + error_log /var/log/nginx/gitlab_pages_error.log; + + # 1. Try to get /project/ from => shared/pages/${host}/${project}/public/ + # 2. Try to get / from => shared/pages/${host}/${host}/public/ + location ~ ^/([^/]*)(/.*)?$ { + try_files "/$1/public$2" + "/$1/public$2/index.html" + "/${host}/public/${uri}" + "/${host}/public/${uri}/index.html" + =404; + } + + # Define custom error pages + error_page 403 /403.html; + error_page 404 /404.html; +} |