gitlab-shell/trunk/configs.patch

   1 commit 91264d5a92bbc464f77fac14e3076e7264cf6513
   2 Author: Anatol Pomozov <anatol.pomozov@gmail.com>
   3 Date:   Tue May 26 00:39:46 2020 -0700
   4
   5     Patch config files with Arch Linux specific locations
   6
   7     Arch uses upstream's default config files as a base for its configs.
   8     But directory structure at Arch is completely different from the default
   9     one specified by gitlab project.
  10     We used to have a lot of seds expressions to adjust the files but as
  11     complexity of configs grew 'sed' makes it easy to miss a changed/added
  12     option.
  13
  14     Track set of diffs as a patch. If upstream modifies config file then it
  15     will cause a conflict that needs to be reviewed manually.
  16
  17 diff --git a/config.yml.example b/config.yml.example
  18 index 645cb88..b99e965 100644
  19 --- a/config.yml.example
  20 +++ b/config.yml.example
  21 @@ -4,7 +4,7 @@
  22  #
  23
  24  # GitLab user. git by default
  25 -user: git
  26 +user: gitlab
  27
  28  # URL to GitLab instance, used for API calls. Default: http://localhost:8080.
  29  # For relative URL support read http://doc.gitlab.com/ce/install/relative_url.html
  30 @@ -13,7 +13,7 @@ user: git
  31  # only listen on a Unix domain socket. For Unix domain sockets use
  32  # "http+unix://<urlquoted-path-to-socket>", e.g.
  33  # "http+unix://%2Fpath%2Fto%2Fsocket"
  34 -gitlab_url: "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
  35 +gitlab_url: "http+unix://%2Frun%2Fgitlab%2Fgitlab-workhorse.socket"
  36
  37  # When a http+unix:// is used in gitlab_url, this is the relative URL root to GitLab.
  38  # Not used if gitlab_url is http:// or https://.
  39 @@ -29,7 +29,7 @@ http_settings:
  40    self_signed_cert: false
  41
  42  # File used as authorized_keys for gitlab user
  43 -auth_file: "/home/git/.ssh/authorized_keys"
  44 +auth_file: "/var/lib/gitlab/.ssh/authorized_keys"
  45
  46  # SSL certificate dir where custom certificates can be placed
  47  # https://golang.org/pkg/crypto/x509/
  48 @@ -37,7 +37,7 @@ auth_file: "/home/git/.ssh/authorized_keys"
  49
  50  # File that contains the secret key for verifying access to GitLab.
  51  # Default is .gitlab_shell_secret in the gitlab-shell directory.
  52 -# secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret"
  53 +secret_file: "/var/lib/gitlab/gitlab-shell/.gitlab_shell_secret"
  54  #
  55  # The secret field supersedes the secret_file, and if set that
  56  # file will not be read.
  57 @@ -45,7 +45,7 @@ auth_file: "/home/git/.ssh/authorized_keys"
  58
  59  # Log file.
  60  # Default is gitlab-shell.log in the root directory.
  61 -# log_file: "/home/git/gitlab-shell/gitlab-shell.log"
  62 +log_file: "/var/log/gitlab/gitlab-shell.log"
  63
  64  # Log level. INFO by default
  65  log_level: INFO