summaryrefslogtreecommitdiff
path: root/lib/support
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-22 02:49:02 +0200
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:55:29 +0000
commit84ff07cdcc846cec7a58aca641363531cda86d92 (patch)
treefb3bc686dc5cd22eb387092e0efccec7fa633a4b /lib/support
parentd9e3bb0e7def068c5b24937bf887b20784d4bd8e (diff)
downloadgitlab-ce-84ff07cdcc846cec7a58aca641363531cda86d92.tar.gz
Simplify NGINX server_name regex
Diffstat (limited to 'lib/support')
-rw-r--r--lib/support/nginx/gitlab-pages2
-rw-r--r--lib/support/nginx/gitlab-pages-ssl4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/support/nginx/gitlab-pages b/lib/support/nginx/gitlab-pages
index 169d7d11ca7..d9746c5c1aa 100644
--- a/lib/support/nginx/gitlab-pages
+++ b/lib/support/nginx/gitlab-pages
@@ -7,7 +7,7 @@ server {
listen [::]:80 ipv6only=on;
## Replace this with something like pages.gitlab.com
- server_name ~^(?<group>.*)\.YOUR_GITLAB_PAGES\.DOMAIN$;
+ server_name ~^.*\.YOUR_GITLAB_PAGES\.DOMAIN$;
## Individual nginx logs for GitLab pages
access_log /var/log/nginx/gitlab_pages_access.log;
diff --git a/lib/support/nginx/gitlab-pages-ssl b/lib/support/nginx/gitlab-pages-ssl
index 16edd337e10..a1ccf266835 100644
--- a/lib/support/nginx/gitlab-pages-ssl
+++ b/lib/support/nginx/gitlab-pages-ssl
@@ -11,7 +11,7 @@ server {
listen [::]:80 ipv6only=on;
## Replace this with something like pages.gitlab.com
- server_name ~^(?<group>.*)\.YOUR_GITLAB_PAGES\.DOMAIN$;
+ 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;
@@ -26,7 +26,7 @@ server {
listen [::]:443 ipv6only=on ssl http2;
## Replace this with something like pages.gitlab.com
- server_name ~^(?<group>.*)\.YOUR_GITLAB_PAGES\.DOMAIN$;
+ server_name ~^.*\.YOUR_GITLAB_PAGES\.DOMAIN$;
server_tokens off; ## Don't show the nginx version number, a security best practice
## Strong SSL Security