diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2019-04-23 08:27:13 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2019-04-23 08:27:13 +0000 |
| commit | c39ae03f678861da446fb053832f083950753f7f (patch) | |
| tree | cfab65122337d3bcf98cf5b3c4e16c430f44e282 /www/gitlab-ce/files/patch-config_gitlab.yml.example | |
| parent | Upgrade to 9.0.0 which is required for Gitlab 11.10 upgrade. (diff) | |
Upgrade to 11.10.
For full log see:
https://about.gitlab.com/2019/04/22/gitlab-11-10-released/
WARNING, this release switches the path were the repositories are
stored back to the default git home dir. Make sure you read the
UPDATING 20190423 entry and follow the update maual very carefully!
Diffstat (limited to 'www/gitlab-ce/files/patch-config_gitlab.yml.example')
| -rw-r--r-- | www/gitlab-ce/files/patch-config_gitlab.yml.example | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 389b871ccce2..e16c7584f6f9 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2019-03-20 23:32:21 UTC +--- config/gitlab.yml.example.orig 2019-04-19 09:51:35 UTC +++ config/gitlab.yml.example @@ -248,7 +248,7 @@ production: &base # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages @@ -9,7 +9,7 @@ ## Mattermost ## For enabling Add to Mattermost button -@@ -645,7 +645,7 @@ production: &base +@@ -649,7 +649,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -18,27 +18,34 @@ # 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. -@@ -663,8 +663,8 @@ production: &base +@@ -667,8 +667,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: - path: /home/git/repositories/ - gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). -+ path: /usr/home/git/repositories/ -+ gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). ++ path: /usr/local/git/repositories/ ++ gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -696,7 +696,7 @@ production: &base +@@ -700,12 +700,12 @@ production: &base ## GitLab Shell settings gitlab_shell: - path: /home/git/gitlab-shell/ +- authorized_keys_file: /home/git/.ssh/authorized_keys + path: %%PREFIX%%/share/gitlab-shell/ ++ authorized_keys_file: %%PREFIX%%/git/.ssh/authorized_keys # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -721,7 +721,7 @@ production: &base +- # secret_file: /home/git/gitlab/.gitlab_shell_secret ++ # secret_file: /usr/local/www/gitlab-ce/.gitlab_shell_secret + + # Git over HTTP + upload_pack: true +@@ -726,7 +726,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: |