Merge pull request #212 from YunoHost-Apps/testing

Testing

README.md

@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features
 
-**Shipped version:** 15.8.3~ynh1
+**Shipped version:** 15.9.1~ynh1
 
 **Demo:** https://gitlab.com/explore
 

README_fr.md

@@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD
 
-**Version incluse :** 15.8.3~ynh1
+**Version incluse :** 15.9.1~ynh1
 
 **Démo :** https://gitlab.com/explore
 

conf/gitlab.rb

@@ -201,7 +201,8 @@ external_url '__GENERATED_EXTERNAL_URL__'
 # gitlab_rails['ssh_keys_expired_notification_worker_cron'] = "0 2 * * *"
 # gitlab_rails['ssh_keys_expiring_soon_notification_worker_cron'] = "0 1 * * *"
 # gitlab_rails['loose_foreign_keys_cleanup_worker_cron'] = "*/5 * * * *"
-# gitlab_rails['ci_runner_versions_reconciliation_worker_cron'] = "20 * * * *"
+# gitlab_rails['ci_runner_versions_reconciliation_worker_cron'] = "@daily"
+# gitlab_rails['ci_runners_stale_machines_cleanup_worker_cron'] = "36 4 * * *"
 
 ### Webhook Settings
 ###! Number of seconds to wait for HTTP response after sending webhook HTTP POST
@@ -310,7 +311,12 @@ external_url '__GENERATED_EXTERNAL_URL__'
 # gitlab_rails['incoming_email_idle_timeout'] = 60
 ####! The file name for internal `mail_room` JSON logfile
 # gitlab_rails['incoming_email_log_file'] = "/var/log/gitlab/mailroom/mail_room_json.log"
+####! This marks incoming messages deleted after delivery.
+####! If you are using Microsoft Graph API instead of IMAP, set this to false to retain
+####! messages in the inbox since deleted messages are auto-expunged after some time.
+# gitlab_rails['incoming_email_delete_after_delivery'] = true
 ####! Permanently remove messages from the mailbox when they are marked as deleted after delivery
+####! Only applies to IMAP. Microsoft Graph will auto-expunge any deleted messages.
 # gitlab_rails['incoming_email_expunge_deleted'] = false
 
 #### Inbox options (for Microsoft Graph)
@@ -358,6 +364,7 @@ external_url '__GENERATED_EXTERNAL_URL__'
 # gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = nil
 # gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = nil
 # gitlab_rails['object_store']['objects']['ci_secure_files']['bucket'] = nil
+# gitlab_rails['object_store']['objects']['pages']['bucket'] = nil
 
 ### Job Artifacts
 # gitlab_rails['artifacts_enabled'] = true
@@ -828,6 +835,9 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__
 # gitlab_rails['redis_rate_limiting_sentinels'] = nil
 # gitlab_rails['redis_sessions_instance'] = nil
 # gitlab_rails['redis_sessions_sentinels'] = nil
+# gitlab_rails['redis_repository_cache_instance'] = nil
+# gitlab_rails['redis_repository_cache_sentinels'] = nil
+# gitlab_rails['redis_yml_override'] = nil
 
 ################################################################################
 ## Container Registry settings
@@ -1099,7 +1109,6 @@ puma['port'] = __PUMA_PORT__
 # sidekiq['log_directory'] = "/var/log/gitlab/sidekiq"
 # sidekiq['log_format'] = "json"
 # sidekiq['shutdown_timeout'] = 4
-# sidekiq['queue_selector'] = false
 # sidekiq['interval'] = nil
 # sidekiq['max_concurrency'] = 20
 # sidekiq['min_concurrency'] = nil
@@ -1116,11 +1125,6 @@ puma['port'] = __PUMA_PORT__
 
 # sidekiq['queue_groups'] = ['*']
 
-##! If negate is enabled then Sidekiq will process all the queues that
-##! don't match those in queue_groups.
-
-# sidekiq['negate'] = false
-
 ##! Specifies where Prometheus metrics endpoints should be made available for Sidekiq processes.
 # sidekiq['metrics_enabled'] = true
 # sidekiq['exporter_log_enabled'] = false
@@ -1168,6 +1172,36 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__
 ##! **We do not recommend changing this directory.**
 # gitlab_shell['dir'] = "/var/opt/gitlab/gitlab-shell"
 
+################################################################################
+## gitlab-sshd
+################################################################################
+
+# gitlab_sshd['enable'] = false
+# gitlab_sshd['generate_host_keys'] = true
+# gitlab_sshd['dir'] = "/var/opt/gitlab/gitlab-sshd"
+
+# gitlab-sshd outputs most logs to /var/log/gitlab/gitlab-shell/gitlab-shell.log.
+# This directory only stores stdout/stderr output from the daemon.
+# gitlab_sshd['log_directory'] = "/var/log/gitlab/gitlab-sshd/"
+
+# gitlab_sshd['env_directory'] = '/opt/gitlab/etc/gitlab-sshd/env'
+# gitlab_sshd['listen_address'] = 'localhost:2222'
+# gitlab_sshd['metrics_address'] = 'localhost:9122'
+# gitlab_sshd['concurrent_sessions_limit'] = 100
+# gitlab_sshd['proxy_protocol'] = false
+# gitlab_sshd['proxy_policy'] = 'use'
+# gitlab_sshd['proxy_header_timeout'] = '500ms'
+# gitlab_sshd['grace_period'] = 55
+# gitlab_sshd['client_alive_interval'] = nil
+# gitlab_sshd['ciphers'] = nil
+# gitlab_sshd['kex_algorithms'] = nil
+# gitlab_sshd['macs'] = nil
+# gitlab_sshd['login_grace_time'] = 60
+# gitlab_sshd['host_keys_dir'] = '/var/opt/gitlab/gitlab-sshd'
+# gitlab_sshd['host_keys_glob'] = 'ssh_host_*_key'
+# gitlab_sshd['host_certs_dir'] = '/var/opt/gitlab/gitlab-sshd'
+# gitlab_sshd['host_certs_glob'] = 'ssh_host_*-cert.pub'
+
 ################################################################
 ## GitLab PostgreSQL
 ################################################################
@@ -1884,7 +1918,7 @@ nginx['listen_https'] = false
 # gitlab_rails['gitlab_kas_enabled'] = true
 # gitlab_rails['gitlab_kas_external_url'] = 'ws://gitlab.example.com/-/kubernetes-agent/'
 # gitlab_rails['gitlab_kas_internal_url'] = 'grpc://localhost:8153'
-# gitlab_rails['gitlab_kas_external_k8s_proxy_url'] = 'https://gitlab.example.com/-/kubernetes-agent/'
+# gitlab_rails['gitlab_kas_external_k8s_proxy_url'] = 'https://gitlab.example.com/-/kubernetes-agent/k8s-proxy/'
 
 ##! Enable GitLab KAS
 # gitlab_kas['enable'] = true
@@ -2479,7 +2513,6 @@ nginx['listen_https'] = false
 # }
 # praefect['wrapper_path'] = "/opt/gitlab/embedded/bin/gitaly-wrapper"
 # praefect['failover_enabled'] = true
-# praefect['failover_timeout'] = "10s"
 # praefect['auth_token'] = ""
 # praefect['auth_transitioning'] = false
 # praefect['listen_addr'] = "localhost:2305"

manifest.json

@@ -2,7 +2,7 @@
     "name": "GitLab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "15.8.3~ynh1",
+    "version": "15.9.1~ynh1",
     "description": {
         "en": "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features",
         "fr": "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD"

scripts/upgrade.d/upgrade.last.sh

@@ -1,18 +1,18 @@
 #!/bin/bash
 
-gitlab_version="15.8.3"
+gitlab_version="15.9.1"
 
 # sha256sum found here: https://packages.gitlab.com/gitlab
 gitlab_debian_version="$(lsb_release -sc)"
 
-gitlab_x86_64_bullseye_source_sha256="51f80218b21a074991eaa73d33f6a731f30851ade555f6e2446b452b3248612d"
+gitlab_x86_64_bullseye_source_sha256="d5ad1cdbbe0f1528f9fc1354aaf62458fad148a3e43999e708b4b3e3ed922560"
-gitlab_x86_64_buster_source_sha256="13776b70a58a39bed2795415c28ff7354a287ac7103178816a50680e933dbc8e"
+gitlab_x86_64_buster_source_sha256="e3f3bc4f434f5036236c0eeeb33a58bc87d64a625a4592fb4c22bbadcc0499ee"
 
-gitlab_arm64_bullseye_source_sha256="5ef36081b15732a8b49f1f8120d513c652eef6c5d77418bad82ebe3f1e72c6f7"
+gitlab_arm64_bullseye_source_sha256="10c8935db7f66929e809b52a2b354d3d5b01034ed596a0379add13b7e75e5ed7"
-gitlab_arm64_buster_source_sha256="a9cfafa3a906e6d6e4d7923d9331b6d971129fc247142ab9c9d1cc9a5f0db982"
+gitlab_arm64_buster_source_sha256="b521658326b24b1b647fedd18028253f96d264b48a6faf1a313b75925890f6d6"
 
-gitlab_arm_buster_source_sha256="e92988ba6f860202a2bce0f529db2e1ba1f180dcc951e679001b9142d0d29e98"
+gitlab_arm_buster_source_sha256="e90e6b0ad4f619040f7e518a83ca4bbcdf373665edbe1edfbe13320de44f54f0"
-gitlab_arm_bullseye_source_sha256="839680fafe0be6dbd9333c914cad38a4d8ff8b16b4b6922de551cc073e4c8147"
+gitlab_arm_bullseye_source_sha256="b59b524b602da091a6b5a989349c7895c468f9083584192fce1056e9cb164d4b"
 
 architecture=$(ynh_app_setting_get --app="$app" --key=architecture)
 
@@ -37,16 +37,16 @@ elif [ "$architecture" = "arm" ]; then
 	then
 		# If the version for arm doesn't exist, then use an older one
 		if [ -z "$gitlab_arm_buster_source_sha256" ]; then
-			gitlab_version="15.8.3"
+			gitlab_version="15.9.1"
-			gitlab_arm_buster_source_sha256="e92988ba6f860202a2bce0f529db2e1ba1f180dcc951e679001b9142d0d29e98"
+			gitlab_arm_buster_source_sha256="e90e6b0ad4f619040f7e518a83ca4bbcdf373665edbe1edfbe13320de44f54f0"
 		fi
 		gitlab_source_sha256=$gitlab_arm_buster_source_sha256
 	elif [ "$gitlab_debian_version" = "buster" ]
 	then
 		# If the version for arm doesn't exist, then use an older one
 		if [ -z "$gitlab_arm_bullseye_source_sha256" ]; then
-			gitlab_version="15.8.3"
+			gitlab_version="15.9.1"
-			gitlab_arm_bullseye_source_sha256="839680fafe0be6dbd9333c914cad38a4d8ff8b16b4b6922de551cc073e4c8147"
+			gitlab_arm_bullseye_source_sha256="b59b524b602da091a6b5a989349c7895c468f9083584192fce1056e9cb164d4b"
 		fi
 		gitlab_source_sha256=$gitlab_arm_bullseye_source_sha256
 	fi