forked from Lainports/freebsd-ports
7d02b1d89d
The last update broke the options and removed the needed gems from the Gemfile Also update patches which weren't committed last time Submitted by: Matthias Fechner <idefix@fechner.net> Reported by: remko
38 lines
1.6 KiB
Text
38 lines
1.6 KiB
Text
--- config/gitlab.yml.example.orig 2017-11-14 20:51:25 UTC
|
|
+++ config/gitlab.yml.example
|
|
@@ -519,8 +519,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:/usr/local/www/gitlab/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
|
|
@@ -548,12 +548,12 @@ production: &base
|
|
|
|
## GitLab Shell settings
|
|
gitlab_shell:
|
|
- path: /home/git/gitlab-shell/
|
|
- hooks_path: /home/git/gitlab-shell/hooks/
|
|
+ path: /usr/local/share/gitlab-shell/
|
|
+ hooks_path: /usr/local/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
|
|
@@ -574,7 +574,7 @@ production: &base
|
|
# CAUTION!
|
|
# Use the default values unless you really know what you are doing
|
|
git:
|
|
- bin_path: /usr/bin/git
|
|
+ bin_path: /usr/local/bin/git
|
|
|
|
## Webpack settings
|
|
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
|