[packages/gitlab-ce] patch path for gitlab-shell secret

glen glen at pld-linux.org
Sun May 15 20:41:53 CEST 2016


commit 9502b2819ea93b06748b909ee29a43bbb8bcfd90
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun May 15 21:40:54 2016 +0300

    patch path for gitlab-shell secret

 pld.patch | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/pld.patch b/pld.patch
index da68dbf..d57d487 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
---- gitlabhq-8.7.5/config/gitlab.yml	2016-05-12 17:35:19.000000000 +0300
-+++ gitlabhq-8.7.5.paths/config/gitlab.yml	2016-05-15 21:30:47.260578333 +0300
+--- gitlabhq-8.7.5.paths/config/gitlab.yml	2016-05-15 21:30:47.260578333 +0300
++++ gitlabhq-8.7.5/config/gitlab.yml	2016-05-15 10:55:03.000000000 +0300
 @@ -56,7 +56,7 @@
        #- 2001:0db8::/32
  
@@ -18,7 +18,7 @@
  
    ## Backup settings
    backup:
-@@ -437,11 +437,11 @@
+@@ -437,15 +437,15 @@
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -33,6 +33,11 @@
  
      # File that contains the secret key for verifying access for gitlab-shell.
      # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
+-    # secret_file: /home/git/gitlab/.gitlab_shell_secret
++    secret_file: /etc/gitlab/.gitlab_shell_secret
+ 
+     # Git over HTTP
+     upload_pack: true
 --- gitlabhq-8.7.5/config/unicorn.rb	2016-05-12 17:35:19.000000000 +0300
 +++ gitlabhq-8.7.5.paths/config/unicorn.rb	2016-05-15 21:30:47.263911838 +0300
 @@ -33,12 +33,12 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/282ff2500045ec9d96063b5a443be1c2e3f6ae78



More information about the pld-cvs-commit mailing list