up to 3.4.0 (Redis Sentinel support for GitLab 8.11)

[packages/gitlab-shell.git] / config.yml.patch

--- gitlab-shell-3.4.0/config.yml~	2016-08-22 22:11:19.000000000 +0300
+++ gitlab-shell-3.4.0/config.yml	2016-08-22 22:12:26.188946328 +0300
@@ -25,7 +25,7 @@
   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"
 
 # File that contains the secret key for verifying access to GitLab.
 # Default is .gitlab_shell_secret in the root directory.
@@ -29,16 +29,16 @@
 
 # File that contains the secret key for verifying access to GitLab.
 # Default is .gitlab_shell_secret in the root directory.
-# secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret"
+secret_file: "/etc/gitlab/.gitlab_shell_secret"
 
 # Redis settings used for pushing commit notices to gitlab
 redis:
   bin: /usr/bin/redis-cli
-  # host: 127.0.0.1
-  # port: 6379
+  host: 127.0.0.1
+  port: 6379
   # pass: redispass # Allows you to specify the password for Redis
   database: 0
-  socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP or Sentinel
+#  socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP or Sentinel
   namespace: resque:gitlab
   # sentinels:
   #   -
@@ -51,7 +51,7 @@
 
 # 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