66 lines
2.5 KiB
Diff
66 lines
2.5 KiB
Diff
|
commit 91264d5a92bbc464f77fac14e3076e7264cf6513
|
||
|
|
Author: Anatol Pomozov <anatol.pomozov@gmail.com>
|
||
|
|
Date: Tue May 26 00:39:46 2020 -0700
|
||
|
|
|
||
|
|
Patch config files with Arch Linux specific locations
|
||
|
|
|
||
|
|
Arch uses upstream's default config files as a base for its configs.
|
||
|
|
But directory structure at Arch is completely different from the default
|
||
|
|
one specified by gitlab project.
|
||
|
|
We used to have a lot of seds expressions to adjust the files but as
|
||
|
|
complexity of configs grew 'sed' makes it easy to miss a changed/added
|
||
|
|
option.
|
||
|
|
|
||
|
|
Track set of diffs as a patch. If upstream modifies config file then it
|
||
|
|
will cause a conflict that needs to be reviewed manually.
|
||
|
|
|
||
|
|
diff --git a/config.yml.example b/config.yml.example
|
||
|
|
index 645cb88..b99e965 100644
|
||
|
|
--- a/config.yml.example
|
||
|
|
+++ b/config.yml.example
|
||
|
|
@@ -4,7 +4,7 @@
|
||
|
|
#
|
||
|
|
|
||
|
|
# GitLab user. git by default
|
||
|
|
-user: git
|
||
|
|
+user: gitlab
|
||
|
|
|
||
|
|
# URL to GitLab instance, used for API calls. Default: http://localhost:8080.
|
||
|
|
# For relative URL support read http://doc.gitlab.com/ce/install/relative_url.html
|
||
|
|
@@ -13,7 +13,7 @@ user: git
|
||
|
|
# only listen on a Unix domain socket. For Unix domain sockets use
|
||
|
|
# "http+unix://<urlquoted-path-to-socket>", e.g.
|
||
|
|
# "http+unix://%2Fpath%2Fto%2Fsocket"
|
||
|
|
-gitlab_url: "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
|
||
|
|
+gitlab_url: "http+unix://%2Frun%2Fgitlab%2Fgitlab-workhorse.socket"
|
||
|
|
|
||
|
|
# When a http+unix:// is used in gitlab_url, this is the relative URL root to GitLab.
|
||
|
|
# Not used if gitlab_url is http:// or https://.
|
||
|
|
@@ -29,7 +29,7 @@ http_settings:
|
||
|
|
self_signed_cert: false
|
||
|
|
|
||
|
|
# File used as authorized_keys for gitlab user
|
||
|
|
-auth_file: "/home/git/.ssh/authorized_keys"
|
||
|
|
+auth_file: "/var/lib/gitlab/.ssh/authorized_keys"
|
||
|
|
|
||
|
|
# SSL certificate dir where custom certificates can be placed
|
||
|
|
# https://golang.org/pkg/crypto/x509/
|
||
|
|
@@ -37,7 +37,7 @@ auth_file: "/home/git/.ssh/authorized_keys"
|
||
|
|
|
||
|
|
# File that contains the secret key for verifying access to GitLab.
|
||
|
|
# Default is .gitlab_shell_secret in the gitlab-shell directory.
|
||
|
|
-# secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret"
|
||
|
|
+secret_file: "/var/lib/gitlab/gitlab-shell/.gitlab_shell_secret"
|
||
|
|
#
|
||
|
|
# The secret field supersedes the secret_file, and if set that
|
||
|
|
# file will not be read.
|
||
|
|
@@ -45,7 +45,7 @@ auth_file: "/home/git/.ssh/authorized_keys"
|
||
|
|
|
||
|
|
# Log file.
|
||
|
|
# Default is gitlab-shell.log in the root directory.
|
||
|
|
-# log_file: "/home/git/gitlab-shell/gitlab-shell.log"
|
||
|
|
+log_file: "/var/log/gitlab/gitlab-shell.log"
|
||
|
|
|
||
|
|
# Log level. INFO by default
|
||
|
|
log_level: INFO
|