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

Anatol Pomozov anatolik at gemini.archlinux.org
Tue Jun 21 17:53:58 UTC 2022 

    Date: Tuesday, June 21, 2022 @ 17:53:58
  Author: anatolik
Revision: 1238852

upgpkg: gitlab 15.1.0-1

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

---------------+
 PKGBUILD      |    4 +-
 configs.patch |   84 +++++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 67 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-21 17:53:29 UTC (rev 1238851)
+++ PKGBUILD	2022-06-21 17:53:58 UTC (rev 1238852)
@@ -8,7 +8,7 @@
 # Contributor: Caleb Maclennan <caleb at alerque.com>
 
 pkgname=gitlab
-pkgver=15.0.2
+pkgver=15.1.0
 pkgrel=1
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
@@ -40,7 +40,7 @@
         gitlab.logrotate)
 install='gitlab.install'
 sha512sums=('SKIP'
-            '8de5f5a11a8b772d13e6c056e9150f253b6bb0ab21c7d3913c848571cfea2a5fb64f65511b4da1773c7a225efac66ea4010dedbbaec117bd6f43864a0960018a'
+            'cd93f745f908800237034f639f1776e4d3111c4375d93e3d44be9b4b25f2e3a39ffaa43c70c3d32e1b534cbc968694288e742ff4052e5f2091cb74cf441170c6'
             '3eb5058d6edc2d16f5558a3ee485ba796aa64fb4b9eb7595390322344b809fcb47a45be9d7fe36c822ac2724aeecb2905a0ea9a868a56349ac2bc5c8c9f070e3'
             '5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067'
             '451a030940f124bccd6d29c1924861b361d52db32cff6e745c144286c2afc7065e117f825721145ed2dd4406f5bcfa97e228a80b968aaa9a675613b71b776eba'

Modified: configs.patch
===================================================================
--- configs.patch	2022-06-21 17:53:29 UTC (rev 1238851)
+++ configs.patch	2022-06-21 17:53:58 UTC (rev 1238852)
@@ -1,4 +1,4 @@
-commit 55bf276ffc622fd5788b73df5bfff574c31ee68a
+commit e7a0fa0d0768872bac6912cd73600d81ab44e5fa
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
 Date:   Tue May 26 00:01:38 2020 -0700
 
@@ -15,7 +15,7 @@
     will cause a conflict that needs to be reviewed manually.
 
 diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
-index a4daab1fd0c7..19c33fdd1f56 100644
+index 5329a8e9fd7a..19c33fdd1f56 100644
 --- a/config/database.yml.postgresql
 +++ b/config/database.yml.postgresql
 @@ -6,7 +6,7 @@ production:
@@ -27,17 +27,63 @@
      password: "secure password"
      host: localhost
      # load_balancing:
-@@ -41,7 +41,7 @@ staging:
+@@ -18,13 +18,6 @@ production:
+     #     port: 8600
+     #     record: secondary.postgresql.service.consul
+     #     interval: 300
+-  geo:
+-    adapter: postgresql
+-    encoding: unicode
+-    database: gitlabhq_geo_production
+-    username: git
+-    password: "secure password"
+-    host: localhost
+ 
+ #
+ # Development specific
+@@ -39,13 +32,6 @@ development:
+     host: localhost
+     variables:
+       statement_timeout: 15s
+-  geo:
+-    adapter: postgresql
+-    encoding: unicode
+-    database: gitlabhq_geo_development
+-    username: postgres
+-    password: "secure password"
+-    host: localhost
+ 
+ #
+ # Staging specific
+@@ -55,14 +41,7 @@ staging:
      adapter: postgresql
      encoding: unicode
      database: gitlabhq_staging
 -    username: git
+-    password: "secure password"
+-    host: localhost
+-  geo:
+-    adapter: postgresql
+-    encoding: unicode
+-    database: gitlabhq_geo_staging
+-    username: git
 +    username: gitlab
      password: "secure password"
      host: localhost
  
+@@ -80,10 +59,3 @@ test: &test
+     prepared_statements: false
+     variables:
+       statement_timeout: 15s
+-  geo:
+-    adapter: postgresql
+-    encoding: unicode
+-    database: gitlabhq_geo_test
+-    username: postgres
+-    password:
+-    host: localhost
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 57106120fb2a..30145c6ace6c 100644
+index 841e7670e454..973c572e79e4 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
 @@ -91,7 +91,7 @@ production: &base
@@ -85,7 +131,7 @@
 -    # 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
+     # Whether to expunge (permanently remove) messages from the mailbox when they are marked as deleted after delivery
      expunge_deleted: false
 @@ -248,7 +248,7 @@ production: &base
      # contains the shared secret key for verifying access for mailroom's
@@ -105,7 +151,7 @@
      # object_store:
      #   enabled: false
      #   remote_directory: artifacts # The bucket name
-@@ -304,7 +304,7 @@ production: &base
+@@ -303,7 +303,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).
@@ -114,7 +160,7 @@
      # object_store:
      #   enabled: false
      #   remote_directory: external-diffs
-@@ -320,7 +320,7 @@ production: &base
+@@ -318,7 +318,7 @@ production: &base
    lfs:
      enabled: true
      # The location where LFS objects are stored (default: shared/lfs-objects).
@@ -123,7 +169,7 @@
      object_store:
        enabled: false
        remote_directory: lfs-objects # Bucket name
-@@ -364,7 +364,7 @@ production: &base
+@@ -358,7 +358,7 @@ production: &base
      enabled: true
      dpkg_deb_path: /usr/bin/dpkg-deb
      # The location where build packages are stored (default: shared/packages).
@@ -132,7 +178,7 @@
      object_store:
        enabled: false
        remote_directory: packages # The bucket name
-@@ -385,7 +385,7 @@ production: &base
+@@ -377,7 +377,7 @@ production: &base
    dependency_proxy:
      enabled: true
      # The location where build packages are stored (default: shared/dependency_proxy).
@@ -141,7 +187,7 @@
      object_store:
        enabled: false
        remote_directory: dependency_proxy # The bucket name
-@@ -406,7 +406,7 @@ production: &base
+@@ -396,7 +396,7 @@ production: &base
    terraform_state:
      enabled: true
      # The location where Terraform state files are stored (default: shared/terraform_state).
@@ -150,7 +196,7 @@
      object_store:
        enabled: false
        remote_directory: terraform # The bucket name
-@@ -442,7 +442,7 @@ production: &base
+@@ -432,7 +432,7 @@ production: &base
      enabled: false
      access_control: false
      # The location where pages are stored (default: shared/pages).
@@ -159,7 +205,7 @@
  
      # The domain under which the pages are served:
      # http://group.example.com/project
-@@ -456,7 +456,7 @@ production: &base
+@@ -446,7 +446,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).
@@ -168,7 +214,7 @@
      object_store:
        enabled: false
        remote_directory: pages # The bucket name
-@@ -627,7 +627,7 @@ production: &base
+@@ -612,7 +612,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
@@ -177,7 +223,7 @@
      # issuer: gitlab-issuer
      # notification_secret: '' # only set it when you use Geo replication feature without built-in Registry
  
-@@ -684,7 +684,7 @@ production: &base
+@@ -669,7 +669,7 @@ production: &base
      # add_pusher: true
  
      # The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root
@@ -186,7 +232,7 @@
  
    #
    # 3. Auth settings
-@@ -1150,7 +1150,7 @@ production: &base
+@@ -1135,7 +1135,7 @@ production: &base
  
    # Shared file storage settings
    shared:
@@ -195,7 +241,7 @@
  
    # Encrypted Settings configuration
    encrypted_settings:
-@@ -1175,14 +1175,14 @@ production: &base
+@@ -1160,14 +1160,14 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -214,7 +260,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
-@@ -1231,12 +1231,12 @@ production: &base
+@@ -1202,12 +1202,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -230,7 +276,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1251,13 +1251,13 @@ production: &base
+@@ -1222,13 +1222,13 @@ 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).
@@ -246,7 +292,7 @@
  
      # The URL to the external KAS API (used by the Kubernetes agents)
      # external_url: wss://kas.example.com
-@@ -1270,7 +1270,7 @@ production: &base
+@@ -1241,7 +1241,7 @@ production: &base
  
    ## GitLab Elasticsearch settings
    elasticsearch:

More information about the arch-commits mailing list