From 38ad738d716e097564d8a4f06ad9da21db1e2b63 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 6 May 2020 11:08:54 +0200 Subject: [PATCH] 12.10.3 --- README.md | 2 +- conf/gitlab.rb | 50 +++++++++++++++++++++++++++---- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 18 +++++------ 4 files changed, 56 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index a37597e..3419ec6 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,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:** 12.10.1 +**Shipped version:** 12.10.3 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 66c2677..129e484 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -95,6 +95,7 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['gitlab_email_smime_enabled'] = false # gitlab_rails['gitlab_email_smime_key_file'] = '/etc/gitlab/ssl/gitlab_smime.key' # gitlab_rails['gitlab_email_smime_cert_file'] = '/etc/gitlab/ssl/gitlab_smime.crt' +# gitlab_rails['gitlab_email_smime_ca_certs_file'] = '/etc/gitlab/ssl/gitlab_smime_cas.crt' ### GitLab user privileges # gitlab_rails['gitlab_default_can_create_group'] = true @@ -476,7 +477,9 @@ EOS # 'provider' => 'AWS', # 'region' => 'eu-west-1', # 'aws_access_key_id' => 'AKIAKIAKI', -# 'aws_secret_access_key' => 'secret123' +# 'aws_secret_access_key' => 'secret123', +# # # If IAM profile use is enabled, remove aws_access_key_id and aws_secret_access_key +# 'use_iam_profile' => false # } # gitlab_rails['backup_upload_remote_directory'] = 'my.s3.bucket' # gitlab_rails['backup_multipart_chunk_size'] = 104857600 @@ -567,8 +570,6 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ### GitLab application settings # gitlab_rails['uploads_directory'] = "/var/opt/gitlab/gitlab-rails/uploads" -# gitlab_rails['rate_limit_requests_per_period'] = 10 -# gitlab_rails['rate_limit_period'] = 60 #### Change the initial default admin password and shared runner registration tokens. ####! **Only applicable on initial setup, changing these settings after database @@ -1921,6 +1922,7 @@ nginx['listen_https'] = false # } # praefect['sentry_dsn'] = "https://:@sentry.io/" # praefect['sentry_environment'] = "production" +# praefect['auto_migrate'] = true # praefect['database_host'] = 'postgres.internal' # praefect['database_port'] = 5432 # praefect['database_user'] = 'praefect' @@ -2158,8 +2160,8 @@ nginx['listen_https'] = false ## GitLab Geo ##! Docs: https://docs.gitlab.com/ee/gitlab-geo ################################################################################ -# geo_primary_role['enable'] = false -# geo_secondary_role['enable'] = false +##! Geo roles 'geo_primary_role' and 'geo_secondary_role' are set above with +##! other roles. For more information, see: https://docs.gitlab.com/omnibus/roles/README.html#roles. # This is an optional identifier which Geo nodes can use to identify themselves. # For example, if external_url is the same for two secondaries, you must specify @@ -2417,5 +2419,43 @@ nginx['listen_https'] = false # handler: 'failover_pgbouncer' # } # } +################################################################################ +# Service desk email settings (EEP only) +################################################################################ +### Service desk email +###! Allow users to create new service desk issues by sending an email to +###! service desk address. +###! Docs: https://docs.gitlab.com/ee/administration/reply_by_email.html +# gitlab_rails['service_desk_email_enabled'] = false + +#### Service Desk Mailbox Settings (via `mail_room`) +#### Service Desk Email Address +####! The email address including the `%{key}` placeholder that will be replaced +####! to reference the item being replied to. +####! **The placeholder can be omitted but if present, it must appear in the +####! "user" part of the address (before the `@`).** +# gitlab_rails['service_desk_email_address'] = "contact_project+%{key}@gmail.com" + +#### Service Desk Email account username +####! **With third party providers, this is usually the full email address.** +####! **With self-hosted email servers, this is usually the user part of the +####! email address.** +# gitlab_rails['service_desk_email_email'] = "contact_project@gmail.com" + +#### Service Desk Email account password +# gitlab_rails['service_desk_email_password'] = "[REDACTED]" + +####! The mailbox where service desk mail will end up. Usually "inbox". +# gitlab_rails['service_desk_email_mailbox_name'] = "inbox" +####! The IDLE command timeout. +# gitlab_rails['service_desk_email_idle_timeout'] = 60 +####! The file name for internal `mail_room` JSON logfile +# gitlab_rails['service_desk_email_log_file'] = "/var/log/gitlab/mailroom/mail_room_json.log" + +#### Service Desk IMAP Settings +# gitlab_rails['service_desk_email_host'] = "imap.gmail.com" +# gitlab_rails['service_desk_email_port'] = 993 +# gitlab_rails['service_desk_email_ssl'] = true +# gitlab_rails['service_desk_email_start_tls'] = false from_file '/etc/gitlab/gitlab-persistent.rb' diff --git a/manifest.json b/manifest.json index cc75e7c..da6d722 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.10.1~ynh1", + "version": "12.10.3~ynh1", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index cbe4d72..c173b3f 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,17 +1,17 @@ -gitlab_version="12.10.1" +gitlab_version="12.10.3" # sha256sum found here: https://packages.gitlab.com/gitlab -if [ "$(lsb_release -sc)" = "buster" ] -then - gitlab_x86_64_source_sha256="4efd4599cecbcdbe4c03acabf8a678da7a1c0f3fe44270dc115128f87704a29c" -else - gitlab_x86_64_source_sha256="114e616b8fad94efcd7bcecd7b69d49c42384d6599ff49809c1951e3007afc9c" -fi - gitlab_x86_64_debian_version="$(lsb_release -sc)" -gitlab_arm_source_sha256="cc52de7777e0a970be20bc3386144a2d2bb0e9aaaa8906e567a4ab0cd638288e" +if [ "$gitlab_x86_64_debian_version" = "buster" ] +then + gitlab_x86_64_source_sha256="dcb8b3b770aa7645f6485d877915e4075da214185f631560df270cfe6de89f0d" +else + gitlab_x86_64_source_sha256="f25c1b15a64eb74209185074363f58cc9082102210c7ef7434a6c82f39b1ffb6" +fi + +gitlab_arm_source_sha256="898bd6492f04846113babe7db95b82dfcf1cf6974fe63482231d8a723e2928fb" gitlab_filename="gitlab-ce-${gitlab_version}.deb"