update config

- tcp for redis
- log path
- secret key path

diff --git a/config.yml.patch b/config.yml.patch
index 5a0a78b033de06ecb2b6690300311119dfde1dba..bcd01d3a857fbcf308c925173cca194dcb999cc8 100644 (file)
--- a/config.yml.patch
+++ b/config.yml.patch
@@ -1,5 +1,5 @@
---- gitlab-shell-1.9.5/config.yml.example.orig 2014-06-02 04:45:01.891389227 +0200
-+++ gitlab-shell-1.9.5/config.yml.example      2014-06-02 04:44:18.214779888 +0200
+--- gitlab-shell-1.9.5/config.yml      2014-06-02 04:44:18.214779888 +0200
++++ gitlab-shell-1.9.5/config.yml      2014-06-02 04:44:18.214779888 +0200
 @@ -1,5 +1,5 @@
  # GitLab user. git by default
 -user: git
@@ -20,12 +20,30 @@
  
  # Redis settings used for pushing commit notices to gitlab
  redis:
-@@ -30,7 +30,7 @@
+@@ -35,21 +35,21 @@
+ 
+ # 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
++#  socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP
+   namespace: resque:gitlab
  
  # Log file.
  # Default is gitlab-shell.log in the root directory.
 -# log_file: "/home/git/gitlab-shell/gitlab-shell.log"
-+log_file: "/var/lib/gitlab/log/gitlab-shell.log"
++log_file: "/var/log/gitlab/gitlab-shell.log"
  
  # Log level. INFO by default
  log_level: INFO

diff --git a/gitlab-shell.spec b/gitlab-shell.spec
index ce4f690667264038bd171521bf0a33a86c0f6741..c17b67f39cce4898a8552999f310ac25a4802c42 100644 (file)
--- a/gitlab-shell.spec
+++ b/gitlab-shell.spec
@@ -1,7 +1,7 @@
 Summary:       GitLab ssh access and repository management
 Name:          gitlab-shell
 Version:       2.6.12
-Release:       0.10
+Release:       1
 License:       MIT
 Group:         Applications/Shells
 Source0:       https://github.com/gitlabhq/gitlab-shell/archive/v%{version}/%{name}-%{version}.tar.gz