Changeset View
Changeset View
Standalone View
Standalone View
www/heptapod/files/patch-config_gitlab.yml.example
- This file was added.
--- config/gitlab.yml.example.orig 2020-07-21 14:46:32 UTC | |||||
+++ config/gitlab.yml.example | |||||
@@ -998,7 +998,7 @@ production: &base | |||||
# Gitaly settings | |||||
gitaly: | |||||
# Path to the directory containing Gitaly client executables. | |||||
- client_path: /home/git/gitaly | |||||
+ client_path: %%PREFIX%%/share/gitaly/bin | |||||
# 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. | |||||
@@ -1016,8 +1016,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/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 | |||||
@@ -1063,12 +1063,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). | |||||
- # secret_file: /home/git/gitlab/.gitlab_shell_secret | |||||
+ # secret_file: /usr/local/www/gitlab-ce/.gitlab_shell_secret | |||||
# Git over HTTP | |||||
upload_pack: true | |||||
@@ -1087,13 +1087,13 @@ production: &base | |||||
## GitLab Elasticsearch settings | |||||
elasticsearch: | |||||
- indexer_path: /home/git/gitlab-elasticsearch-indexer/ | |||||
+ indexer_path: %%PREFIX%%/bin/ | |||||
## Git settings | |||||
# 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 |