Changeset View
Changeset View
Standalone View
Standalone View
www/gitlab-ce/files/patch-config_gitlab.yml.example
- This file was moved from www/gitlab/files/patch-config_gitlab.yml.example.
--- config/gitlab.yml.example.orig 2018-06-06 20:30:27 UTC | --- config/gitlab.yml.example.orig 2018-06-21 15:14:17 UTC | ||||
+++ config/gitlab.yml.example | +++ config/gitlab.yml.example | ||||
@@ -213,7 +213,7 @@ production: &base | @@ -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_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 | # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages | ||||
admin: | admin: | ||||
- address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) | - 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) | + address: unix:/usr/local/www/gitlab-ce/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) | ||||
swills: Another place to use `%%PREFIX%%` and `@${REINPLACE_CMD}`. The result is the same, but it makes… | |||||
Not Done Inline ActionsThis is also covered by https://gitlab.fechner.net/mfechner/Gitlab/issues/129 mfechner: This is also covered by https://gitlab.fechner.net/mfechner/Gitlab/issues/129 | |||||
## Mattermost | ## Mattermost | ||||
## For enabling Add to Mattermost button | ## For enabling Add to Mattermost button | ||||
@@ -572,7 +572,7 @@ production: &base | @@ -577,7 +577,7 @@ production: &base | ||||
# Gitaly settings | # Gitaly settings | ||||
gitaly: | gitaly: | ||||
# Path to the directory containing Gitaly client executables. | # Path to the directory containing Gitaly client executables. | ||||
- client_path: /home/git/gitaly/bin | - client_path: /home/git/gitaly/bin | ||||
+ client_path: /usr/local/share/gitaly/bin | + client_path: /usr/local/share/gitaly/bin | ||||
# Default Gitaly authentication token. Can be overriden per storage. Can | # Default Gitaly authentication token. Can be overriden per storage. Can | ||||
# be left blank when Gitaly is running locally on a Unix socket, which | # be left blank when Gitaly is running locally on a Unix socket, which | ||||
# is the normal way to deploy Gitaly. | # is the normal way to deploy Gitaly. | ||||
@@ -590,8 +590,8 @@ production: &base | @@ -595,8 +595,8 @@ production: &base | ||||
# real path not the symlink. | # real path not the symlink. | ||||
storages: # You must have at least a `default` storage path. | storages: # You must have at least a `default` storage path. | ||||
default: | default: | ||||
- path: /home/git/repositories/ | - 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) | - 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/ | + path: /usr/home/git/repositories/ | ||||
+ gitaly_address: unix:/usr/local/www/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) | + gitaly_address: unix:/usr/local/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. | # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. | ||||
## Backup settings | ## Backup settings | ||||
@@ -619,12 +619,12 @@ production: &base | @@ -624,12 +624,12 @@ production: &base | ||||
## GitLab Shell settings | ## GitLab Shell settings | ||||
gitlab_shell: | gitlab_shell: | ||||
- path: /home/git/gitlab-shell/ | - path: /home/git/gitlab-shell/ | ||||
- hooks_path: /home/git/gitlab-shell/hooks/ | - hooks_path: /home/git/gitlab-shell/hooks/ | ||||
+ path: /usr/local/share/gitlab-shell/ | + path: /usr/local/share/gitlab-shell/ | ||||
+ hooks_path: /usr/local/share/gitlab-shell/hooks/ | + hooks_path: /usr/local/share/gitlab-shell/hooks/ | ||||
# File that contains the secret key for verifying access for gitlab-shell. | # 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). | # 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: /home/git/gitlab/.gitlab_shell_secret | ||||
+ # secret_file: /usr/home/git/gitlab/.gitlab_shell_secret | + # secret_file: /usr/home/git/gitlab/.gitlab_shell_secret | ||||
# Git over HTTP | # Git over HTTP | ||||
upload_pack: true | upload_pack: true | ||||
@@ -645,7 +645,7 @@ production: &base | @@ -650,7 +650,7 @@ production: &base | ||||
# CAUTION! | # CAUTION! | ||||
# Use the default values unless you really know what you are doing | # Use the default values unless you really know what you are doing | ||||
git: | git: | ||||
- bin_path: /usr/bin/git | - bin_path: /usr/bin/git | ||||
+ bin_path: /usr/local/bin/git | + bin_path: /usr/local/bin/git | ||||
## Webpack settings | ## Webpack settings | ||||
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running | # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running |
Another place to use %%PREFIX%% and @${REINPLACE_CMD}. The result is the same, but it makes things work if people change ${PREFIX}, which is technically supported (and separate from ${LOCALBASE}...). Again, this change doesn't have to be done for this to land.