[packages/gitlab-ce] update config patch

glen glen at pld-linux.org
Sun Aug 13 16:09:47 CEST 2017


commit 701fe36de3bb7d294380818a1603085d459ea876
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sun Aug 13 15:32:07 2017 +0300

    update config patch

 pld.patch | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/pld.patch b/pld.patch
index 5e0c19d..668937f 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
---- gitlab-ce-9.1.1/config/gitlab.yml	2017-04-30 20:23:39.245065762 +0300
-+++ gitlab-ce-9.3.3/config/gitlab.yml	2017-07-04 00:56:05.370380322 +0300
+--- gitlab-ce-9.4.4/config/gitlab.yml~	2017-08-13 15:36:24.000000000 +0300
++++ gitlab-ce-9.4.4/config/gitlab.yml	2017-08-13 16:43:37.557515352 +0300
 @@ -30,8 +30,10 @@
    gitlab:
      ## Web server settings (note: host is the FQDN, do not include http://)
@@ -22,16 +22,7 @@
  
      ## Date & Time settings
      # Uncomment and customize if you want to change the default time zone of GitLab application.
-@@ -453,7 +455,7 @@
-     # This setting controls whether GitLab uses Gitaly (new component
-     # introduced in 9.0). Eventually Gitaly use will become mandatory and
-     # this option will disappear.
--    enabled: true
-+    enabled: false
- 
-   #
-   # 4. Advanced settings
-@@ -463,8 +465,9 @@
+@@ -503,8 +505,9 @@
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -39,11 +30,11 @@
 -        gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
 +        path: /var/lib/gitlab/repositories/
 +        # TCP connections are supported too (e.g. tcp://host:port)
-+        # gitaly_address: unix:/var/run/gitlab/gitaly.socket
++        gitaly_address: unix:/var/run/gitlab/gitaly.socket
+         # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
-   backup:
-@@ -498,12 +501,12 @@
+@@ -532,12 +535,12 @@
  
    ## GitLab Shell settings
    gitlab_shell:
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list