[arch-commits] Commit in gitlab/trunk (PKGBUILD configs.patch)

[Anatol Pomozov]

    Date: Friday, June 5, 2020 @ 23:45:08
  Author: anatolik
Revision: 639233

Use absolute path to Gitlab data directory

Modified:
  gitlab/trunk/PKGBUILD
  gitlab/trunk/configs.patch

---------------+
 PKGBUILD      |    2 -
 configs.patch |   96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 94 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-05 21:58:52 UTC (rev 639232)
+++ PKGBUILD	2020-06-05 23:45:08 UTC (rev 639233)
@@ -43,7 +43,7 @@
         ruby27-pop-extra-arg.patch)
 install='gitlab.install'
 sha512sums=('SKIP'
-            'd430a66803308234932ed30cd4489eda2932ba522c1bc4de1be063bd739447eb0c6bea7f33962e20692df2dc74d619209733c4228b1d6671ff1aa4267f2f68a2'
+            '0cecb4a7bdba40961ef17169ff3042da8ffab169786255bf1f1143734efd74daed639ac5de181bf68acb59bc31dbe59a4b632f5be165ccb451c247be6f2d2229'
             '9623de113358d3d6e49047f688e272d9394579734ace1bd647497e8717a90784546d27e547a29197a16c80d72ad9f2c79eb65f8edc631deadf2ec90ee86ea44b'
             '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067'
             '6e6a9be7a3985a20e3140553e95e39b08aa4d13005dd4496eea9d3cac6cc6c223018eb01a0ac496f94606d77d73c18d84c9c230e8869dac87b004b46125d67f7'

Modified: configs.patch
===================================================================
--- configs.patch	2020-06-05 21:58:52 UTC (rev 639232)
+++ configs.patch	2020-06-05 23:45:08 UTC (rev 639233)
@@ -1,4 +1,4 @@
-commit 65881b44f782618d0bb5d37dead5deca8aafdf7a
+commit 7702fed7650340a1f9f43663a97b2b627e4acdc1
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
 Date:   Tue May 26 00:01:38 2020 -0700
 
@@ -37,7 +37,7 @@
    host: localhost
  
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 9a2e470f852..53d6a5e50eb 100644
+index 9a2e470f852..4296c76cb68 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
 @@ -83,7 +83,7 @@ production: &base
@@ -66,6 +66,87 @@
  
      # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
  
+@@ -157,7 +157,7 @@ production: &base
+     ## Repository downloads directory
+     # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
+     # The default is 'shared/cache/archive/' relative to the root of the Rails app.
+-    # repository_downloads_path: shared/cache/archive/
++    repository_downloads_path: /var/lib/gitlab/shared/cache/archive
+ 
+     ## Impersonation settings
+     impersonation_enabled: true
+@@ -200,7 +200,7 @@ production: &base
+     # Since `mail_room` is run independently of Rails, an absolute path is preferred.
+     # The default is 'log/mail_room_json.log' relative to the root of the Rails app.
+     #
+-    # log_path: log/mail_room_json.log
++    log_path: /var/log/gitlab/mail_room_json.log
+ 
+     # Whether to expunge (permanently remove) messages from the mailbox when they are deleted after delivery
+     expunge_deleted: false
+@@ -209,7 +209,7 @@ production: &base
+   artifacts:
+     enabled: true
+     # The location where build artifacts are stored (default: shared/artifacts).
+-    # path: shared/artifacts
++    path: /var/lib/gitlab/shared/artifacts
+     # object_store:
+     #   enabled: false
+     #   remote_directory: artifacts # The bucket name
+@@ -229,7 +229,7 @@ production: &base
+     # be stored on disk, or in object storage
+     enabled: false
+     # The location where external diffs are stored (default: shared/lfs-external-diffs).
+-    # storage_path: shared/external-diffs
++    storage_path: /var/lib/gitlab/shared/external-diffs
+     # object_store:
+     #   enabled: false
+     #   remote_directory: external-diffs
+@@ -245,7 +245,7 @@ production: &base
+   lfs:
+     enabled: true
+     # The location where LFS objects are stored (default: shared/lfs-objects).
+-    # storage_path: shared/lfs-objects
++    storage_path: /var/lib/gitlab/shared/lfs-objects
+     object_store:
+       enabled: false
+       remote_directory: lfs-objects # Bucket name
+@@ -288,7 +288,7 @@ production: &base
+   packages:
+     enabled: true
+     # The location where build packages are stored (default: shared/packages).
+-    # storage_path: shared/packages
++    storage_path: /var/lib/gitlab/shared/packages
+     object_store:
+       enabled: false
+       remote_directory: packages # The bucket name
+@@ -309,7 +309,7 @@ production: &base
+   dependency_proxy:
+     enabled: true
+     # The location where build packages are stored (default: shared/dependency_proxy).
+-    # storage_path: shared/dependency_proxy
++    storage_path: /var/lib/gitlab/shared/dependency_proxy
+     object_store:
+       enabled: false
+       remote_directory: dependency_proxy # The bucket name
+@@ -330,7 +330,7 @@ production: &base
+   terraform_state:
+     enabled: true
+     # The location where Terraform state files are stored (default: shared/terraform_state).
+-    # storage_path: shared/terraform_state
++    storage_path: /var/lib/gitlab/shared/terraform_state
+     object_store:
+       enabled: false
+       remote_directory: terraform_state # The bucket name
+@@ -349,7 +349,7 @@ production: &base
+     enabled: false
+     access_control: false
+     # The location where pages are stored (default: shared/pages).
+-    # path: shared/pages
++    path: /var/lib/gitlab/shared/pages
+ 
+     # The domain under which the pages are served:
+     # http://group.example.com/project
 @@ -363,7 +363,7 @@ production: &base
  
      # File that contains the shared secret key for verifying access for gitlab-pages.
@@ -75,12 +156,21 @@
  
    ## Mattermost
    ## For enabling Add to Mattermost button
+@@ -489,7 +489,7 @@ production: &base
+     # port: 5005
+     # api_url: http://localhost:5000/ # internal address to the registry, will be used by GitLab to directly communicate with API
+     # key: config/registry.key
+-    # path: shared/registry
++    path: /var/lib/gitlab/shared/registry
+     # issuer: gitlab-issuer
+     # notification_secret: '' # only set it when you use Geo replication feature without built-in Registry
+ 
 @@ -546,7 +546,7 @@ production: &base
      # add_pusher: true
  
      # The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root
 -    # builds_path: builds/
-+    builds_path: /var/lib/gitlab/builds/
++    builds_path: /var/lib/gitlab/builds
  
    #
    # 3. Auth settings