4bf80a8a61
https://about.gitlab.com/2018/07/22/gitlab-11-1-released/ - Fixed a typo in config/gitlab.yml.example that was introduced by the prefix update. Approved by: mentors (implicit)
56 lines
2.7 KiB
Text
56 lines
2.7 KiB
Text
--- config/gitlab.yml.example.orig 2018-06-21 15:14:17 UTC
|
|
+++ config/gitlab.yml.example
|
|
@@ -218,7 +218,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
|
|
@@ -577,7 +577,7 @@ production: &base
|
|
# Gitaly settings
|
|
gitaly:
|
|
# Path to the directory containing Gitaly client executables.
|
|
- client_path: /home/git/gitaly/bin
|
|
+ client_path: %%PREFIX%%/share/gitaly/bin
|
|
# 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.
|
|
@@ -595,8 +595,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)
|
|
+ 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)
|
|
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
|
|
|
|
## Backup settings
|
|
@@ -624,12 +624,12 @@ production: &base
|
|
|
|
## GitLab Shell settings
|
|
gitlab_shell:
|
|
- path: /home/git/gitlab-shell/
|
|
- hooks_path: /home/git/gitlab-shell/hooks/
|
|
+ path: %%PREFIX%%/share/gitlab-shell/
|
|
+ hooks_path: %%PREFIX%%/share/gitlab-shell/hooks/
|
|
|
|
# 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).
|
|
- # secret_file: /home/git/gitlab/.gitlab_shell_secret
|
|
+ # secret_file: /usr/home/git/gitlab/.gitlab_shell_secret
|
|
|
|
# Git over HTTP
|
|
upload_pack: true
|
|
@@ -650,7 +650,7 @@ production: &base
|
|
# CAUTION!
|
|
# Use the default values unless you really know what you are doing
|
|
git:
|
|
- bin_path: /usr/bin/git
|
|
+ bin_path: %%PREFIX%%/bin/git
|
|
|
|
## Webpack settings
|
|
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
|