diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 0be4cc1..b832ba4 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -331,6 +331,7 @@ external_url '__GENERATED_EXTERNAL_URL__' # 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 +# gitlab_rails['object_store']['objects']['ci_secure_files']['bucket'] = nil ### Job Artifacts # gitlab_rails['artifacts_enabled'] = true @@ -435,6 +436,23 @@ external_url '__GENERATED_EXTERNAL_URL__' # # 'path_style' => false # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' # } +### CI Secure Files +# gitlab_rails['ci_secure_files_enabled'] = true +# gitlab_rails['ci_secure_files_storage_path'] = "/var/opt/gitlab/gitlab-rails/shared/ci_secure_files" +# gitlab_rails['ci_secure_files_object_store_enabled'] = false +# gitlab_rails['ci_secure_files_object_store_remote_directory'] = "ci-secure-files" +# gitlab_rails['ci_secure_files_object_store_connection'] = { +# 'provider' => 'AWS', +# 'region' => 'eu-west-1', +# 'aws_access_key_id' => 'AWS_ACCESS_KEY_ID', +# 'aws_secret_access_key' => 'AWS_SECRET_ACCESS_KEY', +# # # The below options configure an S3 compatible host instead of AWS +# # 'host' => 's3.amazonaws.com', +# # 'aws_signature_version' => 4, # For creation of signed URLs. Set to 2 if provider does not support v4. +# # 'endpoint' => 'https://s3.amazonaws.com', # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces +# # 'path_style' => false # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' +# } + ### GitLab Pages # gitlab_rails['pages_object_store_enabled'] = false # gitlab_rails['pages_object_store_remote_directory'] = "pages" @@ -1825,11 +1843,19 @@ nginx['listen_https'] = false # gitlab_kas['listen_address'] = 'localhost:8150' # gitlab_kas['listen_network'] = 'tcp' # gitlab_kas['listen_websocket'] = true +# gitlab_kas['certificate_file'] = "/path/to/certificate.pem" +# gitlab_kas['key_file'] = "/path/to/key.pem" # gitlab_kas['internal_api_listen_network'] = 'tcp' # gitlab_kas['internal_api_listen_address'] = 'localhost:8153' +# gitlab_kas['internal_api_certificate_file'] = "/path/to/certificate.pem" +# gitlab_kas['internal_api_key_file'] = "/path/to/key.pem" # gitlab_kas['kubernetes_api_listen_address'] = 'localhost:8154' +# gitlab_kas['kubernetes_api_certificate_file'] = "/path/to/certificate.pem" +# gitlab_kas['kubernetes_api_key_file'] = "/path/to/key.pem" # gitlab_kas['private_api_listen_network'] = 'tcp' # gitlab_kas['private_api_listen_address'] = 'localhost:8155' +# gitlab_kas['private_api_certificate_file'] = "/path/to/certificate.pem" +# gitlab_kas['private_api_key_file'] = "/path/to/key.pem" ##! Metrics configuration for GitLab KAS # gitlab_kas['metrics_usage_reporting_period'] = 60 @@ -1841,6 +1867,10 @@ nginx['listen_https'] = false # 'OWN_PRIVATE_API_URL' => 'grpc://localhost:8155' # } +##! Error Reporting and Logging with Sentry +# gitlab_kas['sentry_dsn'] = 'https://@sentry.io/' +# gitlab_kas['sentry_environment'] = 'production' + ##! Directories for GitLab KAS # gitlab_kas['dir'] = '/var/opt/gitlab/gitlab-kas' # gitlab_kas['log_directory'] = '/var/log/gitlab/gitlab-kas' @@ -2615,6 +2645,14 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ # sentinel['tls_session_cache_size'] = nil # sentinel['tls_session_cache_timeout'] = nil +### Sentinel hostname support +###! When enabled, Redis will leverage hostname support +###! Generally this does not need to be changed as we determine this based on +###! the provided input from `redis['announce_ip']` +###! * This is configured to `true` when a fully qualified hostname is provided +###! * This is configured to `false` when an IP address is provided +# sentinel['use_hostnames'] = + ################################################################################ ## Additional Database Settings (EE only) ##! Docs: https://docs.gitlab.com/ee/administration/database_load_balancing.html @@ -2941,6 +2979,24 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ # } # # consul['custom_config_dir'] = '/path/to/service/configs/directory' +# + +#### HTTP API ports +# consul['http_port'] = nil +# consul['https_port'] = nil + +#### Gossip encryption +# consul['encryption_key'] = nil +# consul['encryption_verify_incoming'] = nil +# consul['encryption_verify_outgoing'] = nil + +#### TLS settings +# consul['use_tls'] = false +# consul['tls_ca_file'] = nil +# consul['tls_certificate_file'] = nil +# consul['tls_key_file'] = nil +# consul['tls_verify_client'] = nil + ################################################################################ # Service desk email settings ################################################################################ @@ -2989,4 +3045,26 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ # 'poll_interval': 60 # Optional # } +################################################################################ +## Spamcheck (EE only) +################################################################################# + +# spamcheck['enable'] = false +# spamcheck['dir'] = '/var/opt/gitlab/spamcheck' +# spamcheck['port'] = 8001 +# spamcheck['external_port'] = nil +# spamcheck['monitoring_address'] = ':8003' +# spamcheck['log_level'] = 'info' +# spamcheck['log_format'] = 'json' +# spamcheck['log_output'] = 'stdout' +# spamcheck['monitor_mode'] = false +# spamcheck['allowlist'] = {} +# spamcheck['denylist'] = {} +# spamcheck['log_directory'] = "/var/log/gitlab/spamcheck" +# spamcheck['env_directory'] = "/opt/gitlab/etc/spamcheck/env" +# spamcheck['env'] = { +# 'SSL_CERT_DIR' => '/opt/gitlab/embedded/ssl/cers' +# } +# spamcheck['classifier']['log_directory'] = "/var/log/gitlab/spam-classifier" + from_file '/etc/gitlab/gitlab-persistent.rb' diff --git a/manifest.json b/manifest.json index 03ccb66..429de65 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "14.7.2~ynh1", + "version": "14.8.0~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" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 1cbd0d0..d41ec69 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,17 +1,17 @@ #!/bin/bash -gitlab_version="14.7.2" +gitlab_version="14.8.0" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bullseye_source_sha256="2610800719b7426ac397861abaa4c3e9d8bfa51d6ca63fb725d72f8f86d58de0" -gitlab_x86_64_buster_source_sha256="b44ae9cb5f053a3af864c3de57278c188eac02bf2e412b0f0c1c14b1c7b2448f" +gitlab_x86_64_bullseye_source_sha256="defaf15ae7ab2a901d7be1a1b97afe6d849c1eff7b2ad7df184eb9971ebd2263" +gitlab_x86_64_buster_source_sha256="ce503bf0ff42d2499358945115ad557f15a3a60a39c166776d4db76a1044bcc9" -gitlab_arm64_bullseye_source_sha256="240a57a7086ade09244f260943baa2306784cdee71b0271ac13b15f451f5c78e" -gitlab_arm64_buster_source_sha256="772d873ab223c466c07777a21cc6518a1d9ee3425a7dbbda6336a03e77ac4615" +gitlab_arm64_bullseye_source_sha256="fe2fa71f00239cba7ed43b5482969ba8cbcb10fe89199bd8d5ee607699007bdb" +gitlab_arm64_buster_source_sha256="7b29a329fa1123fa97d1f299149bc5ce5f52db8b2a3bb8084bc8800507740f0f" -gitlab_arm_buster_source_sha256="f2d8c6b9b7eeff8c45564d7f47e1d8f4e1838cd381e51277ba523f5d9d068f8f" +gitlab_arm_buster_source_sha256="eca82d58a7b6d2c308ec4fcccf8d176ece5508a2ec5297bd3dfcd826135a762d" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) @@ -35,8 +35,8 @@ elif [ "$architecture" = "arm64" ]; then elif [ "$architecture" = "arm" ]; then # If the version for arm doesn't exist, then use an older one if [ -z "$gitlab_arm_buster_source_sha256" ]; then - gitlab_version="14.7.2" - gitlab_arm_buster_source_sha256="f2d8c6b9b7eeff8c45564d7f47e1d8f4e1838cd381e51277ba523f5d9d068f8f" + gitlab_version="14.8.0" + gitlab_arm_buster_source_sha256="eca82d58a7b6d2c308ec4fcccf8d176ece5508a2ec5297bd3dfcd826135a762d" fi gitlab_source_sha256=$gitlab_arm_buster_source_sha256 fi