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

[Anatol Pomozov]

    Date: Monday, January 4, 2021 @ 18:29:13
  Author: anatolik
Revision: 807852

upgpkg: gitlab 13.7.1-1

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

---------------+
 PKGBUILD      |    6 +++---
 configs.patch |   31 +++++++++++++++++--------------
 2 files changed, 20 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-04 18:28:44 UTC (rev 807851)
+++ PKGBUILD	2021-01-04 18:29:13 UTC (rev 807852)
@@ -8,8 +8,8 @@
 # Contributor: Caleb Maclennan <caleb at alerque.com>
 
 pkgname=gitlab
-pkgver=13.6.3
-pkgrel=2
+pkgver=13.7.1
+pkgrel=1
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
 url="https://gitlab.com/gitlab-org/gitlab-foss"
@@ -40,7 +40,7 @@
         gitlab.logrotate)
 install='gitlab.install'
 sha512sums=('SKIP'
-            '282a2063a9ac04272ab46c04417aedecc46ff99db6e35cf8b6bf04b3c38f1dc7492677d95f95773e756a52fcc5fba85e844931271dab52aa582598cbb9cacde3'
+            'e6e4b72697c550f8564d3b3eea1588e0ecc9abdd8891ae24ccef7f5bf7df2ab90e2421e6332b57ee88057612e7a51184d7a1fa0d2badbdb2b480af10750fc49a'
             '790611d868e8206b83694f8509c38e49f92fc85678b9ff81e0d158dcb3f4c8251f231b8e71b77e216eb254dedbaf68ea46348896aa327f04c6dd4cb08a661dbd'
             '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067'
             '75bf9e5ad238a862dfc2638101fb74101227d88958a5f0fdf1ced3833e403f91b6a5908dfb97c5172f75748737212bf87d05b7d39bbe90ed5d3a6c248c1c1ab6'

Modified: configs.patch
===================================================================
--- configs.patch	2021-01-04 18:28:44 UTC (rev 807851)
+++ configs.patch	2021-01-04 18:29:13 UTC (rev 807852)
@@ -1,4 +1,4 @@
-commit 508b9f94959d539e06739f27a0c21ee1e3a8fe18
+commit 2503037d114eecfc0d0924c4895c8ddd7e00d487
 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 de389514cce..8ec23a02591 100644
+index 57788e55f8f..fc7011d0be4 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
 @@ -83,7 +83,7 @@ production: &base
@@ -114,9 +114,9 @@
      object_store:
        enabled: false
        remote_directory: lfs-objects # Bucket name
-@@ -318,7 +318,7 @@ production: &base
-   packages:
+@@ -319,7 +319,7 @@ production: &base
      enabled: true
+     dpkg_deb_path: /usr/bin/dpkg-deb
      # The location where build packages are stored (default: shared/packages).
 -    # storage_path: shared/packages
 +    storage_path: /var/lib/gitlab/shared/packages
@@ -123,7 +123,7 @@
      object_store:
        enabled: false
        remote_directory: packages # The bucket name
-@@ -339,7 +339,7 @@ production: &base
+@@ -340,7 +340,7 @@ production: &base
    dependency_proxy:
      enabled: true
      # The location where build packages are stored (default: shared/dependency_proxy).
@@ -132,7 +132,7 @@
      object_store:
        enabled: false
        remote_directory: dependency_proxy # The bucket name
-@@ -360,7 +360,7 @@ production: &base
+@@ -361,7 +361,7 @@ production: &base
    terraform_state:
      enabled: true
      # The location where Terraform state files are stored (default: shared/terraform_state).
@@ -141,7 +141,7 @@
      object_store:
        enabled: false
        remote_directory: terraform # The bucket name
-@@ -379,7 +379,7 @@ production: &base
+@@ -380,7 +380,7 @@ production: &base
      enabled: false
      access_control: false
      # The location where pages are stored (default: shared/pages).
@@ -150,7 +150,7 @@
  
      # The domain under which the pages are served:
      # http://group.example.com/project
-@@ -393,7 +393,7 @@ production: &base
+@@ -394,7 +394,7 @@ production: &base
  
      # File that contains the shared secret key for verifying access for gitlab-pages.
      # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -159,7 +159,7 @@
      object_store:
        enabled: false
        remote_directory: pages # The bucket name
-@@ -544,7 +544,7 @@ production: &base
+@@ -549,7 +549,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
@@ -168,7 +168,7 @@
      # issuer: gitlab-issuer
      # notification_secret: '' # only set it when you use Geo replication feature without built-in Registry
  
-@@ -601,7 +601,7 @@ production: &base
+@@ -606,7 +606,7 @@ production: &base
      # add_pusher: true
  
      # The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root
@@ -177,7 +177,7 @@
  
    #
    # 3. Auth settings
-@@ -1039,12 +1039,12 @@ production: &base
+@@ -1056,7 +1056,7 @@ production: &base
  
    # Shared file storage settings
    shared:
@@ -184,6 +184,9 @@
 -    # path: /mnt/gitlab # Default: shared
 +    path: /var/lib/gitlab/shared # Default: shared
  
+   # Encrypted Settings configuration
+   encrypted_settings:
+@@ -1065,7 +1065,7 @@ production: &base
    # Gitaly settings
    gitaly:
      # Path to the directory containing Gitaly client executables.
@@ -192,7 +195,7 @@
      # Default Gitaly authentication token. Can be overridden per storage. Can
      # be left blank when Gitaly is running locally on a Unix socket, which
      # is the normal way to deploy Gitaly.
-@@ -1062,13 +1062,13 @@ production: &base
+@@ -1083,13 +1083,13 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -209,7 +212,7 @@
      # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600)
      # keep_time: 604800   # default: 0 (forever) (in seconds)
      # pg_schema: public     # default: nil, it means that all schemas will be backed up
-@@ -1109,12 +1109,12 @@ production: &base
+@@ -1130,12 +1130,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -225,7 +228,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1129,16 +1129,16 @@ production: &base
+@@ -1150,16 +1150,16 @@ production: &base
    workhorse:
      # File that contains the secret key for verifying access for gitlab-workhorse.
      # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).