Merge pull request #120 from YunoHost-Apps/testing

13.2.3

README.md

@@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 
 GitLab is a web-based Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features, using an open-source license, developed by GitLab Inc.
 
-**Shipped version:** 13.1.4
+**Shipped version:** 13.2.3
 
 ## Screenshots
 

README_fr.md

@@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 GitLab est un gestionnaire Web de dépôt Git fournissant des fonctionnalités de wiki, de rapports de bugs et de pipeline CI/CD. GitLab est une application open source développée par GitLab Inc.
 
-**Version incluse :** 13.1.4
+**Version incluse :** 13.2.3
 
 ## Captures d'écran
 

conf/gitlab.rb

@@ -256,6 +256,30 @@ external_url '__GENERATED_EXTERNAL_URL__'
 ####! The format of mail_room crash logs
 # mailroom['exit_log_format'] = "plain"
 
+### Consolidated (simplified) object storage configuration
+###! This uses a single credential for object storage with multiple buckets.
+###! It also enables Workhorse to upload files directly with its own S3 client
+###! instead of using pre-signed URLs.
+###!
+###! This configuration will only take effect if the object_store
+###! sections are not defined within the types. For example, enabling
+###! gitlab_rails['artifacts_object_store_enabled'] or
+###! gitlab_rails['lfs_object_store_enabled'] will prevent the
+###! consolidated settings from being used.
+###!
+###! Be sure to use different buckets for each type of object.
+###! Docs: https://docs.gitlab.com/ee/administration/object_storage.html
+gitlab_rails['object_store']['enabled'] = false
+gitlab_rails['object_store']['connection'] = {}
+gitlab_rails['object_store']['proxy_download'] = false
+gitlab_rails['object_store']['objects']['artifacts']['bucket'] = nil
+gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = nil
+gitlab_rails['object_store']['objects']['lfs']['bucket'] = nil
+gitlab_rails['object_store']['objects']['uploads']['bucket'] = nil
+gitlab_rails['object_store']['objects']['packages']['bucket'] = nil
+gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = nil
+gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = nil
+
 ### Job Artifacts
 # gitlab_rails['artifacts_enabled'] = true
 # gitlab_rails['artifacts_path'] = "/var/opt/gitlab/gitlab-rails/shared/artifacts"
@@ -1016,6 +1040,7 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__
 ### SSL settings
 # See https://www.postgresql.org/docs/11/static/runtime-config-connection.html#GUC-SSL-CERT-FILE for more details
 # postgresql['ssl'] = 'on'
+# postgresql['hostssl'] = false
 # postgresql['ssl_ciphers'] = 'HIGH:MEDIUM:+3DES:!aNULL:!SSLv3:!TLSv1'
 # postgresql['ssl_cert_file'] = 'server.crt'
 # postgresql['ssl_key_file'] = 'server.key'
@@ -1682,6 +1707,15 @@ nginx['listen_https'] = false
 
 ##! Advanced settings. Should be changed only if absolutely needed.
 # prometheus['listen_address'] = 'localhost:9090'
+#
+
+################################################################################
+###! **Only needed if Prometheus and Rails are not on the same server.**
+### For example, in a multi-node architecture, Prometheus will be installed on the monitoring node, while Rails will be on the Rails node.
+### https://docs.gitlab.com/ee/administration/monitoring/prometheus/index.html#using-an-external-prometheus-server
+### This value should be the address at which Prometheus is available to GitLab Rails(Puma/Unicorn, Sidekiq) node.
+################################################################################
+# gitlab_rails['prometheus_address'] = 'your.prom:9090'
 
 ################################################################################
 ## Prometheus Alertmanager
@@ -1936,6 +1970,9 @@ nginx['listen_https'] = false
 # praefect['auth_token'] = ""
 # praefect['auth_transitioning'] = false
 # praefect['listen_addr'] = "localhost:2305"
+# praefect['tls_listen_addr'] = "localhost:3305"
+# praefect['certificate_path'] = "/var/opt/gitlab/prafect/certificate.pem"
+# praefect['key_path'] = "/var/opt/gitlab/prafect/key.pem"
 # praefect['prometheus_listen_addr'] = "localhost:9652"
 # praefect['prometheus_grpc_latency_buckets'] = "[0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]"
 # praefect['logging_level'] = "warn"
@@ -2027,7 +2064,6 @@ nginx['listen_https'] = false
 # gitlab_rails['geo_prune_event_log_worker_cron'] = "*/5 * * * *"
 # gitlab_rails['geo_repository_verification_primary_batch_worker_cron'] = "*/5 * * * *"
 # gitlab_rails['geo_repository_verification_secondary_scheduler_worker_cron'] = "*/5 * * * *"
-# gitlab_rails['geo_migrated_local_files_clean_up_worker_cron'] = "15 */6 * * *"
 # gitlab_rails['ldap_sync_worker_cron'] = "30 1 * * *"
 # gitlab_rails['ldap_group_sync_worker_cron'] = "0 * * * *"
 # gitlab_rails['historical_data_worker_cron'] = "0 12 * * *"

manifest.json

@@ -2,7 +2,7 @@
     "name": "Gitlab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "13.1.4~ynh1",
+    "version": "13.2.3~ynh1",
     "description": {
         "en": "Git-repository manager.",
         "fr": "Gestionnaire de dépôts Git."

scripts/upgrade.d/upgrade.13.first.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 # It's required to upgrade to the latest 13.0.x version before to another 13.X verion.
-gitlab_version="13.0.10"
+gitlab_version="13.0.12"
 
 # sha256sum found here: https://packages.gitlab.com/gitlab
 
-gitlab_x86_64_buster_source_sha256="d2b964e313983e03c8920327972ccd500800745b37db95227977765ec1ae7f0d"
+gitlab_x86_64_buster_source_sha256="b568a8f45fdcb0c94e125fcc1e393e3f7364a4ab04d195bcf9b0797e71e0a8dd"
 
-gitlab_x86_64_stretch_source_sha256="1d378f5488aeaafa08ffd05e316e384210ed53e572282d2a7270de6605d45b64"
+gitlab_x86_64_stretch_source_sha256="464b3d5923d945856fc851d0a01fc43fe223003a32a80bf90a84b599009fdce7"
 
-gitlab_arm_stretch_source_sha256="cd5987686dcfa36acfd8ec37c9ac53a27c0f472948c9418745f0760b6e861ce3"
+gitlab_arm_stretch_source_sha256="39d7af79b80da73f26c8d2fa1ff95dfbca1573d36d6ee362e6f8fadceb17325e"
 
 architecture=$(ynh_app_setting_get --app="$app" --key=architecture)
 

scripts/upgrade.d/upgrade.last.sh

@@ -1,18 +1,18 @@
 #!/bin/bash
 
-gitlab_version="13.1.4"
+gitlab_version="13.2.3"
 
 # sha256sum found here: https://packages.gitlab.com/gitlab
 
 gitlab_debian_version="$(lsb_release -sc)"
 
-gitlab_x86_64_buster_source_sha256="b39df97b871b2def2287ddf3995fc44f9afa1ad68982a0beecfc2740761b769a"
+gitlab_x86_64_buster_source_sha256="0ecce1957260de9cca3325fc0772a5976d604f3d2d5a81e10cfda7aba4dd9f7b"
 
-gitlab_arm_buster_source_sha256="092b17f00cc36ccf08076c5194f8418e52c34a9f07aa6529d01ef0784c5bae88"
+gitlab_arm_buster_source_sha256="0f5e1579ced77650950a062dd89dfb0c6c9a117c94c2204c9a10d6f37f0fe4d9"
 
-gitlab_x86_64_stretch_source_sha256="733ad6468e5ecd571a6233c88d1512c092591ada3f8bc24dcaa7f68f61d52d69"
+gitlab_x86_64_stretch_source_sha256="d4437de930401e5417d5afb093a3d307e3bccb1bf71cde2fd7c79f98577604e4"
 
-gitlab_arm_stretch_source_sha256="26266529281d9c0b6c6f7b1d29b97de2f9c08a2ffb86ada18f09f29cc0fd0fef"
+gitlab_arm_stretch_source_sha256="5dff5d413392c2ab1fd549e938e7cc17c39b82ced92a2efcd322e5e7193ce259"
 
 architecture=$(ynh_app_setting_get --app="$app" --key=architecture)