diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2018-06-21 15:45:20 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2018-06-21 15:45:20 +0000 |
| commit | 5c346d7fe44c68a350e797450bb221db5ebb9bfc (patch) | |
| tree | a83884fe5f35b94942a5747528e76708f6714eda /www/gitlab/files/patch-config_gitlab.yml.example | |
| parent | Update www/rubygem-gitlab-gollum-lib to 4.2.7.5 required for gitlab 10.8.x. (diff) | |
Update www/gitlab to 10.8.4.
Incremental rollouts, plus open source push mirroring
See here for all details: https://about.gitlab.com/2018/05/22/gitlab-10-8-released/
Reviewed by: mat, swills (mentor)
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D15950
Notes
Notes:
svn path=/head/; revision=472981
Diffstat (limited to 'www/gitlab/files/patch-config_gitlab.yml.example')
| -rw-r--r-- | www/gitlab/files/patch-config_gitlab.yml.example | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 3525fe458ecd..8a58ff7a8d67 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,6 +1,15 @@ ---- config/gitlab.yml.example.orig 2018-05-28 11:47:11 UTC +--- config/gitlab.yml.example.orig 2018-06-06 20:30:27 UTC +++ config/gitlab.yml.example -@@ -570,7 +570,7 @@ production: &base +@@ -213,7 +213,7 @@ production: &base + # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages + # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages + admin: +- address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) ++ address: unix:/usr/local/www/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) + + ## Mattermost + ## For enabling Add to Mattermost button +@@ -572,7 +572,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -9,7 +18,7 @@ # Default Gitaly authentication token. Can be overriden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -588,8 +588,8 @@ production: &base +@@ -590,8 +590,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -20,7 +29,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -617,12 +617,12 @@ production: &base +@@ -619,12 +619,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -36,7 +45,7 @@ # Git over HTTP upload_pack: true -@@ -643,7 +643,7 @@ production: &base +@@ -645,7 +645,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: |