1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/gitlab_ynh.git synced 2024-09-03 18:36:35 +02:00

Merge pull request #202 from YunoHost-Apps/testing

15.3.1
This commit is contained in:
Kayou 2022-08-30 10:55:23 +02:00 committed by GitHub
commit 93641b5835
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 18 deletions

View file

@ -17,7 +17,8 @@ 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 Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features
**Shipped version:** 15.2.2~ynh1 **Shipped version:** 15.3.1~ynh1
**Demo:** https://gitlab.com/explore **Demo:** https://gitlab.com/explore

View file

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

View file

@ -201,6 +201,7 @@ external_url '__GENERATED_EXTERNAL_URL__'
# gitlab_rails['ssh_keys_expired_notification_worker_cron'] = "0 2 * * *" # gitlab_rails['ssh_keys_expired_notification_worker_cron'] = "0 2 * * *"
# gitlab_rails['ssh_keys_expiring_soon_notification_worker_cron'] = "0 1 * * *" # gitlab_rails['ssh_keys_expiring_soon_notification_worker_cron'] = "0 1 * * *"
# gitlab_rails['loose_foreign_keys_cleanup_worker_cron'] = "*/5 * * * *" # gitlab_rails['loose_foreign_keys_cleanup_worker_cron'] = "*/5 * * * *"
# gitlab_rails['ci_runner_versions_reconciliation_worker_cron'] = "20 * * * *"
### Webhook Settings ### Webhook Settings
###! Number of seconds to wait for HTTP response after sending webhook HTTP POST ###! Number of seconds to wait for HTTP response after sending webhook HTTP POST
@ -310,8 +311,8 @@ external_url '__GENERATED_EXTERNAL_URL__'
# } # }
#### How incoming emails are delivered to Rails process. Accept either sidekiq #### How incoming emails are delivered to Rails process. Accept either sidekiq
#### or webhook. The default config is sidekiq. #### or webhook. The default config is webhook.
# gitlab_rails['incoming_email_delivery_method'] = "sidekiq" # gitlab_rails['incoming_email_delivery_method'] = "webhook"
#### Token to authenticate webhook requests. The token must be exactly 32 bytes, #### Token to authenticate webhook requests. The token must be exactly 32 bytes,
#### encoded with base64 #### encoded with base64
@ -1061,6 +1062,10 @@ puma['port'] = __PUMA_PORT__
# puma['exporter_tls_cert_path'] = "" # puma['exporter_tls_cert_path'] = ""
# puma['exporter_tls_key_path'] = "" # puma['exporter_tls_key_path'] = ""
# puma['prometheus_scrape_scheme'] = 'http'
# puma['prometheus_scrape_tls_server_name'] = 'localhost'
# puma['prometheus_scrape_tls_skip_verification'] = false
##! Service name used to register Puma as a Consul service ##! Service name used to register Puma as a Consul service
# puma['consul_service_name'] = 'rails' # puma['consul_service_name'] = 'rails'
##! Semantic metadata used when registering Puma as a Consul service ##! Semantic metadata used when registering Puma as a Consul service
@ -2230,6 +2235,11 @@ nginx['listen_https'] = false
# gitlab_exporter['tls_cert_path'] = '/etc/gitlab/ssl/gitlab-exporter.crt' # gitlab_exporter['tls_cert_path'] = '/etc/gitlab/ssl/gitlab-exporter.crt'
# gitlab_exporter['tls_key_path'] = '/etc/gitlab/ssl/gitlab-exporter.key' # gitlab_exporter['tls_key_path'] = '/etc/gitlab/ssl/gitlab-exporter.key'
##! Prometheus scrape related configs
# gitlab_exporter['prometheus_scrape_scheme'] = 'http'
# gitlab_exporter['prometheus_scrape_tls_server_name'] = 'localhost'
# gitlab_exporter['prometheus_scrape_tls_skip_verification'] = false
##! Manage gitlab-exporter sidekiq probes. false by default when Sentinels are ##! Manage gitlab-exporter sidekiq probes. false by default when Sentinels are
##! found. ##! found.
# gitlab_exporter['probe_sidekiq'] = true # gitlab_exporter['probe_sidekiq'] = true
@ -2253,7 +2263,7 @@ nginx['listen_https'] = false
##! Docs: https://docs.gitlab.com/ee/administration/monitoring/prometheus/#prometheus-as-a-grafana-data-source ##! Docs: https://docs.gitlab.com/ee/administration/monitoring/prometheus/#prometheus-as-a-grafana-data-source
################################################################################ ################################################################################
# grafana['enable'] = true # grafana['enable'] = false
# grafana['log_directory'] = '/var/log/gitlab/grafana' # grafana['log_directory'] = '/var/log/gitlab/grafana'
# grafana['home'] = '/var/opt/gitlab/grafana' # grafana['home'] = '/var/opt/gitlab/grafana'
# grafana['admin_password'] = 'admin' # grafana['admin_password'] = 'admin'
@ -3128,8 +3138,8 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
# } # }
#### How service desk emails are delivered to Rails process. Accept either #### How service desk emails are delivered to Rails process. Accept either
#### sidekiq or webhook. The default config is sidekiq. #### sidekiq or webhook. The default config is webhook.
# gitlab_rails['service_desk_email_delivery_method'] = "sidekiq" # gitlab_rails['service_desk_email_delivery_method'] = "webhook"
#### Token to authenticate webhook requests. The token must be exactly 32 bytes, #### Token to authenticate webhook requests. The token must be exactly 32 bytes,
#### encoded with base64 #### encoded with base64

View file

@ -2,7 +2,7 @@
"name": "GitLab", "name": "GitLab",
"id": "gitlab", "id": "gitlab",
"packaging_format": 1, "packaging_format": 1,
"version": "15.2.2~ynh1", "version": "15.3.1~ynh1",
"description": { "description": {
"en": "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features", "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" "fr": "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD"
@ -13,7 +13,8 @@
"website": "https://gitlab.com", "website": "https://gitlab.com",
"demo": "https://gitlab.com/explore", "demo": "https://gitlab.com/explore",
"admindoc": "https://docs.gitlab.com/", "admindoc": "https://docs.gitlab.com/",
"code": "https://gitlab.com/gitlab-org/omnibus-gitlab - https://gitlab.com/gitlab-org/gitlab" "code": "https://gitlab.com/gitlab-org/omnibus-gitlab - https://gitlab.com/gitlab-org/gitlab",
"cpe": "cpe:2.3:a:gitlab:gitlab"
}, },
"license": "MIT", "license": "MIT",
"maintainer": { "maintainer": {
@ -62,4 +63,4 @@
} }
] ]
} }
} }

View file

@ -8,6 +8,7 @@
source _common.sh source _common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
ynh_abort_if_errors
#================================================= #=================================================
# RETRIEVE ARGUMENTS # RETRIEVE ARGUMENTS

View file

@ -1,17 +1,17 @@
#!/bin/bash #!/bin/bash
gitlab_version="15.2.2" gitlab_version="15.3.1"
# sha256sum found here: https://packages.gitlab.com/gitlab # sha256sum found here: https://packages.gitlab.com/gitlab
gitlab_debian_version="$(lsb_release -sc)" gitlab_debian_version="$(lsb_release -sc)"
gitlab_x86_64_bullseye_source_sha256="d2a65650a15eb25c4a0c80e09db85edb31c99f54bdee751e6201c3977bd5058e" gitlab_x86_64_bullseye_source_sha256="064da1aba682c3c5b8ee07eb171ea9e8e05ef1c74f166b533f6ef674cb4fd744"
gitlab_x86_64_buster_source_sha256="27b1e6ea735ea64cb534b25eb1ec2b0c672002e6fac84cf610a8b13f1573775a" gitlab_x86_64_buster_source_sha256="422f114a450b4b433c6036d45004c81184e511cfad4bbd21a30defb168a99edc"
gitlab_arm64_bullseye_source_sha256="46f6623b254ef32ef051a472cd8718ceddf8d1a912f742a1c458aebdc513ccb1" gitlab_arm64_bullseye_source_sha256="40f62bb77d71128af94e6938832ade9d6d871c20062149df888e59ed7795015c"
gitlab_arm64_buster_source_sha256="a60e28b94c3de9540e507fd4522580ff8bc0c17028f5f06cdf81dbf012115753" gitlab_arm64_buster_source_sha256="4d2eff7c83d6d8d7d94f4b6eee451edcfafc14b00ba0753e51672dcd010aca00"
gitlab_arm_buster_source_sha256="33147e1ee5281a5bf2f956b8237ee0a1352dab25f3931922e7e22f110884fa00" gitlab_arm_buster_source_sha256="3e7f51f7283d762f2ed834a1d94a2708cdb824782719d7b7e9ad2664089ccaf7"
architecture=$(ynh_app_setting_get --app="$app" --key=architecture) architecture=$(ynh_app_setting_get --app="$app" --key=architecture)
@ -34,8 +34,8 @@ elif [ "$architecture" = "arm64" ]; then
elif [ "$architecture" = "arm" ]; then elif [ "$architecture" = "arm" ]; then
# If the version for arm doesn't exist, then use an older one # If the version for arm doesn't exist, then use an older one
if [ -z "$gitlab_arm_buster_source_sha256" ]; then if [ -z "$gitlab_arm_buster_source_sha256" ]; then
gitlab_version="15.2.2" gitlab_version="15.3.1"
gitlab_arm_buster_source_sha256="33147e1ee5281a5bf2f956b8237ee0a1352dab25f3931922e7e22f110884fa00" gitlab_arm_buster_source_sha256="3e7f51f7283d762f2ed834a1d94a2708cdb824782719d7b7e9ad2664089ccaf7"
fi fi
gitlab_source_sha256=$gitlab_arm_buster_source_sha256 gitlab_source_sha256=$gitlab_arm_buster_source_sha256
fi fi