diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2019-09-30 22:47:43 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2019-09-30 22:47:43 +0000 |
| commit | b9042f75a3613755635fcbeeeffa4f2a79a6ceeb (patch) | |
| tree | 0f2d33fe97eab7c41ceccb885c47c04a97c57383 /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | devel/gitlab-shell: upgrade to 10.0.0 which is required for gitlab-ce 12.3 up... (diff) | |
www/gitlab-ce: upgrade to 12.3.1.
Changelog:
https://about.gitlab.com/2019/09/22/gitlab-12-3-released/
https://about.gitlab.com/2019/09/24/gitlab-12-3-1-released/
Diffstat (limited to 'www/gitlab-ce/files/patch-config_gitlab.yml.example')
| -rw-r--r-- | www/gitlab-ce/files/patch-config_gitlab.yml.example | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index a57672e52e91..0f0716fd728f 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,15 +1,15 @@ ---- config/gitlab.yml.example.orig 2019-07-26 17:57:42 UTC +--- config/gitlab.yml.example.orig 2019-09-24 12:11:44 UTC +++ config/gitlab.yml.example -@@ -287,7 +287,7 @@ production: &base +@@ -320,7 +320,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:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) - - ## Mattermost - ## For enabling Add to Mattermost button -@@ -832,7 +832,7 @@ production: &base + # File that contains the shared secret key for verifying access for gitlab-pages. + # Default is '.gitlab_pages_shared_secret' relative to Rails.root (i.e. root of the GitLab app). + # secret_file: /home/git/gitlab/.gitlab_pages_shared_secret +@@ -895,7 +895,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -18,7 +18,7 @@ # Default Gitaly authentication token. Can be overridden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -850,8 +850,8 @@ production: &base +@@ -913,8 +913,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -29,7 +29,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -897,12 +897,12 @@ production: &base +@@ -960,12 +960,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -45,7 +45,7 @@ # Git over HTTP upload_pack: true -@@ -923,7 +923,7 @@ production: &base +@@ -990,7 +990,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: |