summaryrefslogtreecommitdiff
path: root/lib/support
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-21 00:31:46 +0200
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:55:28 +0000
commit4b45f284c9d060de06f4f54d9e5b1c2815b743dd (patch)
tree55700bb2123b9e3756e22ad2f8d4a7eb0711b0cb /lib/support
parent50bbc326a475f0cca8e63c7a8de96b3f5538cee0 (diff)
downloadgitlab-ce-4b45f284c9d060de06f4f54d9e5b1c2815b743dd.tar.gz
Change the pages daemon proxy listen port to 8090
So as to be consistent with what is set in Omnibus
Diffstat (limited to 'lib/support')
-rwxr-xr-xlib/support/init.d/gitlab.default.example2
-rw-r--r--lib/support/nginx/gitlab-pages2
-rw-r--r--lib/support/nginx/gitlab-pages-ssl2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/support/init.d/gitlab.default.example b/lib/support/init.d/gitlab.default.example
index 6a4f6b090c9..f096298afbb 100755
--- a/lib/support/init.d/gitlab.default.example
+++ b/lib/support/init.d/gitlab.default.example
@@ -68,7 +68,7 @@ gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log"
# The -pages-domain must be specified the same as in `gitlab.yml > pages > host`.
# Set `gitlab_pages_enabled=false` if you want to disable the Pages feature.
gitlab_pages_enabled=true
-gitlab_pages_options="-pages-domain example.com -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8282"
+gitlab_pages_options="-pages-domain example.com -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090"
gitlab_pages_log="$app_root/log/gitlab-pages.log"
# mail_room_enabled specifies whether mail_room, which is used to process incoming email, is enabled.
diff --git a/lib/support/nginx/gitlab-pages b/lib/support/nginx/gitlab-pages
index 2e0eb2af4b1..169d7d11ca7 100644
--- a/lib/support/nginx/gitlab-pages
+++ b/lib/support/nginx/gitlab-pages
@@ -19,7 +19,7 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
# The same address as passed to GitLab Pages: `-listen-proxy`
- proxy_pass http://localhost:8282/;
+ proxy_pass http://localhost:8090/;
}
# Define custom error pages
diff --git a/lib/support/nginx/gitlab-pages-ssl b/lib/support/nginx/gitlab-pages-ssl
index 1045cd42d2f..16edd337e10 100644
--- a/lib/support/nginx/gitlab-pages-ssl
+++ b/lib/support/nginx/gitlab-pages-ssl
@@ -68,7 +68,7 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
# The same address as passed to GitLab Pages: `-listen-proxy`
- proxy_pass http://localhost:8282/;
+ proxy_pass http://localhost:8090/;
}
# Define custom error pages