commit 8d514e0b33aa85964e5c63e3ec75c353afb965ff
Author: Elan Ruusamäe <g...@delfi.ee>
Date: Fri Dec 23 20:21:23 2016 +0200
up to 4.1.1
config.yml.patch | 11 +++++++----
gitlab-shell.spec | 4 ++--
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/gitlab-shell.spec b/gitlab-shell.spec
index bc9ed20..aa10fd4 100644
--- a/gitlab-shell.spec
+++ b/gitlab-shell.spec
@@ -1,11 +1,11 @@
Summary: GitLab ssh access and repository management
Name: gitlab-shell
-Version: 4.0.0
+Version: 4.1.1
Release: 1
License: MIT
Group: Applications/Shells
Source0:
https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.bz2?ref=v%{version}&/%{name}-%{version}.tar.bz2
-# Source0-md5: 54a8a5374007277982dea2f9f07a99d1
+# Source0-md5: 401549acd04258f400a6fb1821525911
Patch0: unvendor-redis.patch
Patch1: skip_hooks_setup.patch
Patch2: config.yml.patch
diff --git a/config.yml.patch b/config.yml.patch
index a0c2a85..78e4b25 100644
--- a/config.yml.patch
+++ b/config.yml.patch
@@ -1,5 +1,5 @@
---- 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
+--- gitlab-shell-4.1.1/config.yml~ 2016-12-23 20:20:05.000000000 +0200
++++ gitlab-shell-4.1.1/config.yml 2016-12-23 20:20:45.966319553 +0200
@@ -25,7 +25,7 @@
self_signed_cert: false
@@ -9,13 +9,16 @@
# File that contains the secret key for verifying access to GitLab.
# Default is .gitlab_shell_secret in the root directory.
-@@ -29,16 +29,16 @@
+@@ -29,7 +29,7 @@
# File that contains the secret key for verifying access to GitLab.
- # Default is .gitlab_shell_secret in the root directory.
+ # Default is .gitlab_shell_secret in the gitlab-shell directory.
-# secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret"
+secret_file: "/etc/gitlab/.gitlab_shell_secret"
+ # Parent directory for global custom hook directories (pre-receive.d,
update.d, post-receive.d)
+ # Default is hooks in the gitlab-shell directory.
+@@ -38,11 +38,11 @@
# Redis settings used for pushing commit notices to gitlab
redis:
bin: /usr/bin/redis-cli
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-shell.git/commitdiff/2cc334085ff3e5365391b2d073358a7e13da3ef5
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
