From 7b12c7e86c6e028ff91eda41e866af668acc88b6 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sun, 27 Oct 2019 18:02:10 +0900 Subject: [PATCH 01/75] remove backup strategy --- scripts/backup | 37 +------------------------------- scripts/config | 58 -------------------------------------------------- 2 files changed, 1 insertion(+), 94 deletions(-) diff --git a/scripts/backup b/scripts/backup index 770025f..b1f6538 100644 --- a/scripts/backup +++ b/scripts/backup @@ -55,45 +55,10 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= ynh_script_progression --message="Backuping of Gitlab..." --weight=9 -to_skip="" - -if [ $backup_db -eq 0 ]; then - to_skip="db,"$to_skip -fi - -if [ $backup_uploads -eq 0 ]; then - to_skip="uploads,"$to_skip -fi - -if [ $backup_repositories -eq 0 ]; then - to_skip="repositories,"$to_skip -fi - -if [ $backup_builds -eq 0 ]; then - to_skip="builds,"$to_skip -fi - -if [ $backup_artifacts -eq 0 ]; then - to_skip="artifacts,"$to_skip -fi - -if [ $backup_lfs -eq 0 ]; then - to_skip="lfs,"$to_skip -fi - -if [ $backup_registry -eq 0 ]; then - to_skip="registry,"$to_skip -fi - -if [ $backup_pages -eq 0 ]; then - to_skip="pages,"$to_skip -fi - # Use gitlab-rake to backup # For the complete doc: https://docs.gitlab.com/ce/raketasks/backup_restore.html # For the filename: https://docs.gitlab.com/ce/raketasks/backup_restore.html#backup-filename -# For the backup strategy: https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup -gitlab-backup create BACKUP=last SKIP=$to_skip +gitlab-backup create BACKUP=last ynh_backup --src_path="/var/opt/$app/backups/last_gitlab_backup.tar" diff --git a/scripts/config b/scripts/config index efaa386..3c927b5 100644 --- a/scripts/config +++ b/scripts/config @@ -37,31 +37,6 @@ overwrite_nginx="${YNH_CONFIG_MAIN_OVERWRITE_FILES_OVERWRITE_NGINX:-$old_overwri old_use_web_account="$(ynh_app_setting_get --app=$app --key=use_web_account)" use_web_account="${YNH_CONFIG_MAIN_USERS_USE_WEB_ACCOUNT:-$old_use_web_account}" -# backup_strategy -old_backup_db="$(ynh_app_setting_get --app=$app --key=backup_db)" -backup_db="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_DB:-$old_backup_db}" - -old_backup_uploads="$(ynh_app_setting_get --app=$app --key=backup_uploads)" -backup_uploads="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_UPLOADS:-$old_backup_uploads}" - -old_backup_repositories="$(ynh_app_setting_get --app=$app --key=backup_repositories)" -backup_repositories="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_REPOSITORIES:-$old_backup_repositories}" - -old_backup_builds="$(ynh_app_setting_get --app=$app --key=backup_builds)" -backup_builds="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_BUILDS:-$old_backup_builds}" - -old_backup_artifacts="$(ynh_app_setting_get --app=$app --key=backup_artifacts)" -backup_artifacts="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_ARTIFACTS:-$old_backup_artifacts}" - -old_backup_lfs="$(ynh_app_setting_get --app=$app --key=backup_lfs)" -backup_lfs="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_LFS:-$old_backup_lfs}" - -old_backup_registry="$(ynh_app_setting_get --app=$app --key=backup_registry)" -backup_registry="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_REGISTRY:-$old_backup_registry}" - -old_backup_pages="$(ynh_app_setting_get --app=$app --key=backup_pages)" -backup_pages="${YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_PAGES:-$old_backup_pages}" - #================================================= # SHOW_CONFIG FUNCTION FOR 'SHOW' COMMAND #================================================= @@ -75,22 +50,6 @@ show_config() { ynh_return "YNH_CONFIG_MAIN_OVERWRITE_FILES_OVERWRITE_NGINX=$overwrite_nginx" ynh_return "YNH_CONFIG_MAIN_USERS_USE_WEB_ACCOUNT=$use_web_account" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_DB=$backup_db" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_UPLOADS=$backup_uploads" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_REPOSITORIES=$backup_repositories" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_BUILDS=$backup_builds" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_ARTIFACTS=$backup_artifacts" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_LFS=$backup_lfs" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_REGISTRY=$backup_registry" - - ynh_return "YNH_CONFIG_MAIN_BACKUP_STRATEGY_BACKUP_PAGES=$backup_pages" } #================================================= @@ -106,23 +65,6 @@ apply_config() { # Set overwrite_nginx ynh_app_setting_set --app=$app --key=overwrite_nginx --value="$overwrite_nginx" - - # Set backup_db - ynh_app_setting_set --app=$app --key=backup_db --value="$backup_db" - # Set backup_uploads - ynh_app_setting_set --app=$app --key=backup_uploads --value="$backup_uploads" - # Set backup_repositories - ynh_app_setting_set --app=$app --key=backup_repositories --value="$backup_repositories" - # Set backup_builds - ynh_app_setting_set --app=$app --key=backup_builds --value="$backup_builds" - # Set backup_artifacts - ynh_app_setting_set --app=$app --key=backup_artifacts --value="$backup_artifacts" - # Set backup_lfs - ynh_app_setting_set --app=$app --key=backup_lfs --value="$backup_lfs" - # Set backup_registry - ynh_app_setting_set --app=$app --key=backup_registry --value="$backup_registry" - # Set backup_pages - ynh_app_setting_set --app=$app --key=backup_pages --value="$backup_pages" } #================================================= From d7309caaa53aecb33ade03fa584e91b56e51d48d Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 6 Nov 2019 21:48:59 +0900 Subject: [PATCH 02/75] remove remaining code of backup strategy --- config_panel.json | 79 ----------------------------------------------- scripts/backup | 9 ------ scripts/install | 14 --------- scripts/upgrade | 42 ------------------------- 4 files changed, 144 deletions(-) diff --git a/config_panel.json b/config_panel.json index 965a554..e6d4d84 100644 --- a/config_panel.json +++ b/config_panel.json @@ -49,85 +49,6 @@ "default": true } ] - }, - { - "name": "Backup strategy", - "id": "backup_strategy", - "help": "WARNING: If you disable one of these backup, it will not be restored in case of error, use this feature at your own risk", - "options": [ - { - "name": "backup_db", - "ask": { - "en": "Should gitlab backup the database ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_uploads", - "ask": { - "en": "Should gitlab backup attachments ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_repositories", - "ask": { - "en": "Should gitlab backup git repositories data ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_builds", - "ask": { - "en": "Should gitlab backup CI job output logs ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_artifacts", - "ask": { - "en": "Should gitlab backup CI job artifacts ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_lfs", - "ask": { - "en": "Should gitlab backup LFS objects ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_registry", - "ask": { - "en": "Should gitlab backup container registry images ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - }, - { - "name": "backup_pages", - "ask": { - "en": "Should gitlab backup pages content ?" - }, - "help": "https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup", - "type": "boolean", - "default": true - } - ] } ] } diff --git a/scripts/backup b/scripts/backup index b1f6538..895d95e 100644 --- a/scripts/backup +++ b/scripts/backup @@ -32,15 +32,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) config_path=$(ynh_app_setting_get --app=$app --key=config_path) domain=$(ynh_app_setting_get --app=$app --key=domain) -backup_db=$(ynh_app_setting_get --app="$app" --key=backup_db) -backup_uploads=$(ynh_app_setting_get --app="$app" --key=backup_uploads) -backup_repositories=$(ynh_app_setting_get --app="$app" --key=backup_repositories) -backup_builds=$(ynh_app_setting_get --app="$app" --key=backup_builds) -backup_artifacts=$(ynh_app_setting_get --app="$app" --key=backup_artifacts) -backup_lfs=$(ynh_app_setting_get --app="$app" --key=backup_lfs) -backup_registry=$(ynh_app_setting_get --app="$app" --key=backup_registry) -backup_pages=$(ynh_app_setting_get --app="$app" --key=backup_pages) - #================================================= # STANDARD BACKUP STEPS #================================================= diff --git a/scripts/install b/scripts/install index 52657de..a4257ea 100644 --- a/scripts/install +++ b/scripts/install @@ -221,20 +221,6 @@ newuser.confirmation_token = nil newuser.save ApplicationSetting.last.update_attributes(password_authentication_enabled_for_web: $use_web_account, signup_enabled: $use_web_account)" | gitlab-rails console - -#================================================= -# DEFINE THE BACKUP STRATEGY: https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup -#================================================= - -ynh_app_setting_set --app=$app --key=backup_db --value=1 -ynh_app_setting_set --app=$app --key=backup_uploads --value=1 -ynh_app_setting_set --app=$app --key=backup_repositories --value=1 -ynh_app_setting_set --app=$app --key=backup_builds --value=1 -ynh_app_setting_set --app=$app --key=backup_artifacts --value=1 -ynh_app_setting_set --app=$app --key=backup_lfs --value=1 -ynh_app_setting_set --app=$app --key=backup_registry --value=1 -ynh_app_setting_set --app=$app --key=backup_pages --value=1 - #================================================= # RECONFIGURE TO TAKE INTO ACCOUNT CHANGES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index eb0fe70..3f95394 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,15 +33,6 @@ unicorn_worker_processes=$(ynh_app_setting_get --app="$app" --key=unicorn_worker client_max_body_size=$(ynh_app_setting_get --app="$app" --key=client_max_body_size) overwrite_nginx=$(ynh_app_setting_get --app="$app" --key=overwrite_nginx) -backup_db=$(ynh_app_setting_get --app="$app" --key=backup_db) -backup_uploads=$(ynh_app_setting_get --app="$app" --key=backup_uploads) -backup_repositories=$(ynh_app_setting_get --app="$app" --key=backup_repositories) -backup_builds=$(ynh_app_setting_get --app="$app" --key=backup_builds) -backup_artifacts=$(ynh_app_setting_get --app="$app" --key=backup_artifacts) -backup_lfs=$(ynh_app_setting_get --app="$app" --key=backup_lfs) -backup_registry=$(ynh_app_setting_get --app="$app" --key=backup_registry) -backup_pages=$(ynh_app_setting_get --app="$app" --key=backup_pages) - #================================================= # CHECK VERSION #================================================= @@ -155,39 +146,6 @@ if [ -e "/etc/apt/sources.list.d/gitlab-ce.list" ]; then ynh_secure_remove --file="/etc/apt/sources.list.d/gitlab-ce.list" fi -# Define the backup strategy: https://docs.gitlab.com/ce/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup -if [ -z "$backup_db" ]; then - ynh_app_setting_set --app=$app --key=backup_db --value=1 -fi - -if [ -z "$backup_uploads" ]; then - ynh_app_setting_set --app=$app --key=backup_uploads --value=1 -fi - -if [ -z "$backup_repositories" ]; then - ynh_app_setting_set --app=$app --key=backup_repositories --value=1 -fi - -if [ -z "$backup_builds" ]; then - ynh_app_setting_set --app=$app --key=backup_builds --value=1 -fi - -if [ -z "$backup_artifacts" ]; then - ynh_app_setting_set --app=$app --key=backup_artifacts --value=1 -fi - -if [ -z "$backup_lfs" ]; then - ynh_app_setting_set --app=$app --key=backup_lfs --value=1 -fi - -if [ -z "$backup_registry" ]; then - ynh_app_setting_set --app=$app --key=backup_registry --value=1 -fi - -if [ -z "$backup_pages" ]; then - ynh_app_setting_set --app=$app --key=backup_pages --value=1 -fi - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= From 38cb491c5c9f1697ec7e4ba0854733056d7c89b3 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 22 Nov 2019 22:31:36 +0900 Subject: [PATCH 03/75] 12.5.0 --- README.md | 2 +- conf/gitlab.rb | 89 ++++++++++++++++++++----------- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +-- 4 files changed, 63 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 4ecb5f0..c134f37 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.4.1 +**Shipped version:** 12.5.0 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index b81c81e..5a34fff 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -99,7 +99,7 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['gitlab_default_projects_features_container_registry'] = true ### Automatic issue closing -###! See https://docs.gitlab.com/ce/customization/issue_closing.html for more +###! See https://docs.gitlab.com/ee/customization/issue_closing.html for more ###! information about this pattern. # gitlab_rails['gitlab_issue_closing_pattern'] = "\b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)" @@ -117,7 +117,7 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! Periodically executed jobs, to self-heal Gitlab, do external ###! synchronizations, etc. ###! Docs: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job -###! https://docs.gitlab.com/ce/ci/yaml/README.html#artifacts:expire_in +###! https://docs.gitlab.com/ee/ci/yaml/README.html#artifacts:expire_in # gitlab_rails['stuck_ci_jobs_worker_cron'] = "0 0 * * *" # gitlab_rails['expire_build_artifacts_worker_cron'] = "50 * * * *" # gitlab_rails['pipeline_schedule_worker_cron'] = "19 * * * *" @@ -176,10 +176,15 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! Time between sampling of unicorn socket metrics, in seconds # gitlab_rails['monitoring_unicorn_sampler_interval'] = 10 +### Shutdown settings +###! Defines an interval to block healthcheck, +###! but continue accepting application requests. +# gitlab_rails['shutdown_blackout_seconds'] = 10 + ### Reply by email ###! Allow users to comment on issues and merge requests by replying to ###! notification emails. -###! Docs: https://docs.gitlab.com/ce/administration/reply_by_email.html +###! Docs: https://docs.gitlab.com/ee/administration/reply_by_email.html # gitlab_rails['incoming_email_enabled'] = true #### Incoming Email Address @@ -311,6 +316,7 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! in yaml format and the spaces must be retained. Using tabs will not work.** gitlab_rails['ldap_enabled'] = true +# gitlab_rails['prevent_ldap_sign_in'] = false ###! **remember to close this block with 'EOS' below** # gitlab_rails['ldap_servers'] = YAML.load <<-'EOS' @@ -382,7 +388,7 @@ EOS # gitlab_rails['smartcard_san_extensions'] = false ### OmniAuth Settings -###! Docs: https://docs.gitlab.com/ce/integration/omniauth.html +###! Docs: https://docs.gitlab.com/ee/integration/omniauth.html # gitlab_rails['omniauth_enabled'] = nil # gitlab_rails['omniauth_allow_single_sign_on'] = ['saml'] # gitlab_rails['omniauth_sync_email_from_provider'] = 'saml' @@ -409,7 +415,7 @@ EOS # gitlab_rails['manage_backup_path'] = true # gitlab_rails['backup_path'] = "/var/opt/gitlab/backups" -###! Docs: https://docs.gitlab.com/ce/raketasks/backup_restore.html#backup-archive-permissions +###! Docs: https://docs.gitlab.com/ee/raketasks/backup_restore.html#backup-archive-permissions # gitlab_rails['backup_archive_permissions'] = 0644 # gitlab_rails['backup_pg_schema'] = 'public' @@ -469,7 +475,7 @@ EOS # gitlab_rails['gitaly_token'] = 'secret token' ### For storing GitLab application uploads, eg. LFS objects, build artifacts -###! Docs: https://docs.gitlab.com/ce/development/shared_files.html +###! Docs: https://docs.gitlab.com/ee/development/shared_files.html # gitlab_rails['shared_path'] = '/var/opt/gitlab/gitlab-rails/shared' ### Wait for file system to be mounted @@ -533,7 +539,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['db_encoding'] = "unicode" # gitlab_rails['db_collation'] = nil # gitlab_rails['db_database'] = "gitlabhq_production" -# gitlab_rails['db_pool'] = 10 +# gitlab_rails['db_pool'] = 1 # gitlab_rails['db_username'] = "gitlab" # gitlab_rails['db_password'] = nil # gitlab_rails['db_host'] = nil @@ -605,7 +611,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ################################################################################ ## Container Registry settings -##! Docs: https://docs.gitlab.com/ce/administration/container_registry.html +##! Docs: https://docs.gitlab.com/ee/administration/container_registry.html ################################################################################ # registry_external_url 'https://registry.example.com' @@ -651,7 +657,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # registry['compatibility_schema1_enabled'] = false ### Registry backend storage -###! Docs: https://docs.gitlab.com/ce/administration/container_registry.html#container-registry-storage-driver +###! Docs: https://docs.gitlab.com/ee/administration/container_registry.html#container-registry-storage-driver # registry['storage'] = { # 's3' => { # 'accesskey' => 'AKIAKIAKI', @@ -789,7 +795,6 @@ unicorn['port'] = __UNICORN_PORT__ # unicorn['exporter_enabled'] = false # unicorn['exporter_address'] = "127.0.0.1" # unicorn['exporter_port'] = 8083 -# unicorn['exporter_blackout_seconds'] = 10 ################################################################################ ## GitLab Puma @@ -821,7 +826,6 @@ unicorn['port'] = __UNICORN_PORT__ # puma['exporter_enabled'] = false # puma['exporter_address'] = "127.0.0.1" # puma['exporter_port'] = 8083 -# puma['exporter_blackout_seconds'] = 10 ################################################################################ ## GitLab Sidekiq @@ -1031,7 +1035,7 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ ###! **To enable only Redis service in this machine, uncomment ###! one of the lines below (choose master or slave instance types).** ###! Docs: https://docs.gitlab.com/omnibus/settings/redis.html -###! https://docs.gitlab.com/ce/administration/high_availability/redis.html +###! https://docs.gitlab.com/ee/administration/high_availability/redis.html # redis_master_role['enable'] = true # redis_slave_role['enable'] = true @@ -1044,7 +1048,7 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ ###! **You need a master slave Redis replication to be able to do failover** ###! **Please read the documentation before enabling it to understand the ###! caveats:** -###! Docs: https://docs.gitlab.com/ce/administration/high_availability/redis.html +###! Docs: https://docs.gitlab.com/ee/administration/high_availability/redis.html ### Replication support #### Slave Redis instance @@ -1297,7 +1301,7 @@ nginx['listen_https'] = false ################################################################################ ## GitLab Pages -##! Docs: https://docs.gitlab.com/ce/pages/administration.html +##! Docs: https://docs.gitlab.com/ee/pages/administration.html ################################################################################ ##! Define to enable GitLab Pages @@ -1370,6 +1374,9 @@ nginx['listen_https'] = false ##! Define custom gitlab-pages HTTP headers for the whole instance # gitlab_pages['headers'] = [] +##! Shared secret used for authentication between Pages and GitLab +# gitlab_pages['api_secret_key'] = nil # Will be generated if not set. Base64 encoded and exactly 32 bytes long. + ################################################################################ ## GitLab Pages NGINX ################################################################################ @@ -1387,7 +1394,7 @@ nginx['listen_https'] = false ################################################################################ ## GitLab CI -##! Docs: https://docs.gitlab.com/ce/ci/quick_start/README.html +##! Docs: https://docs.gitlab.com/ee/ci/quick_start/README.html ################################################################################ # gitlab_ci['gitlab_ci_all_broken_builds'] = true @@ -1478,14 +1485,18 @@ nginx['listen_https'] = false # "X-Forwarded-Ssl" => "on" # } +# When the registry is automatically enabled using the same domain as `external_url`, +# it listens on this port +# registry_nginx['listen_port'] = 5050 + ################################################################################ ## Prometheus -##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/ +##! Docs: https://docs.gitlab.com/ee/administration/monitoring/prometheus/ ################################################################################ ###! **To enable only Monitoring service in this machine, uncomment ###! the line below.** -###! Docs: https://docs.gitlab.com/ce/administration/high_availability +###! Docs: https://docs.gitlab.com/ee/administration/high_availability # monitoring_role['enable'] = true # prometheus['enable'] = true @@ -1576,7 +1587,7 @@ nginx['listen_https'] = false ################################################################################ ## Prometheus Node Exporter -##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/node_exporter.html +##! Docs: https://docs.gitlab.com/ee/administration/monitoring/prometheus/node_exporter.html ################################################################################ # node_exporter['enable'] = true @@ -1595,7 +1606,7 @@ nginx['listen_https'] = false ################################################################################ ## Prometheus Redis exporter -##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/redis_exporter.html +##! Docs: https://docs.gitlab.com/ee/administration/monitoring/prometheus/redis_exporter.html ################################################################################ # redis_exporter['enable'] = true @@ -1613,7 +1624,7 @@ nginx['listen_https'] = false ################################################################################ ## Prometheus Postgres exporter -##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/postgres_exporter.html +##! Docs: https://docs.gitlab.com/ee/administration/monitoring/prometheus/postgres_exporter.html ################################################################################ # postgres_exporter['enable'] = true @@ -1641,7 +1652,7 @@ nginx['listen_https'] = false ################################################################################ ## Prometheus Gitlab exporter -##! Docs: https://docs.gitlab.com/ce/administration/monitoring/prometheus/gitlab_exporter.html +##! Docs: https://docs.gitlab.com/ee/administration/monitoring/prometheus/gitlab_exporter.html ################################################################################ @@ -1662,7 +1673,7 @@ nginx['listen_https'] = false ################################################################################ ## Grafana Dashboards -##! Docs: https://docs.gitlab.com/ce/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'] = false @@ -1736,6 +1747,11 @@ grafana['enable'] = false # 'PATH' => "/opt/gitlab/bin:/opt/gitlab/embedded/bin:/bin:/usr/bin", # 'HOME' => '/var/opt/gitlab' # } + +##! internal_socket_dir is the directory that will contain internal gitaly sockets, +##! separate from socket_path which is the socket that external clients listen on + +# gitaly['internal_socket_dir'] = "/var/opt/gitlab/gitaly" # gitaly['socket_path'] = "/var/opt/gitlab/gitaly/gitaly.socket" # gitaly['listen_addr'] = "localhost:8075" # gitaly['tls_listen_addr] = "localhost:9075" @@ -1786,23 +1802,21 @@ grafana['enable'] = false # praefect['enable'] = false # praefect['virtual_storage_name'] = "praefect" # praefect['auth_token'] = "" -# praefect['auth_transitioning'] = false +# praefect['auth_transitioning'] = false # praefect['listen_addr'] = "localhost:2305" # praefect['prometheus_listen_addr'] = "localhost:9652" # praefect['logging_level'] = "warn" # praefect['logging_format'] = "json" -# praefect['storage_nodes'] = [ -# { -# 'storage' => 'praefect', +# praefect['storage_nodes'] = { +# 'praefect' => { # 'address' => 'tcp://12:23:56:78', # 'token' => 'abc123' # }, -# { -# 'storoge' => 'praefect-2', +# 'praefect-2' => { # 'address' => 'tcp://praefect2.internal', # 'token' => 'xyz456' # } -# ] +# } ################################################################################ # Storage check @@ -1835,6 +1849,10 @@ grafana['enable'] = false ##! version that supports it (>= 227). Will be a no-op if user is not on systemd. # package['systemd_tasks_max'] = 4915 +##! Settings to configure order of GitLab's systemd unit. +##! Note: We do not recommend changing these values unless absolutely necessary +# package['systemd_after'] = 'multi-user.target' +# package['systemd_wanted_by'] = 'multi-user.target' ################################################################################ ################################################################################ ## Configuration Settings for GitLab EE only ## @@ -1927,7 +1945,7 @@ grafana['enable'] = false ##! To enable Sentinel and disable all other services in this machine, ##! uncomment the line below (if you've enabled Redis role, it will keep it). -##! Docs: https://docs.gitlab.com/ce/administration/high_availability/redis.html +##! Docs: https://docs.gitlab.com/ee/administration/high_availability/redis.html # redis_sentinel_role['enable'] = true # sentinel['enable'] = true @@ -2046,7 +2064,7 @@ grafana['enable'] = false # geo_secondary['db_encoding'] = "unicode" # geo_secondary['db_collation'] = nil # geo_secondary['db_database'] = "gitlabhq_geo_production" -# geo_secondary['db_pool'] = 10 +# geo_secondary['db_pool'] = 1 # geo_secondary['db_username'] = "gitlab_geo" # geo_secondary['db_password'] = nil # geo_secondary['db_host'] = "/var/opt/gitlab/geo-postgresql" @@ -2071,6 +2089,15 @@ grafana['enable'] = false ##! `SQL_USER_PASSWORD_HASH` can be generated using the command `gitlab-ctl pg-password-md5 gitlab` # geo_postgresql['sql_user_password'] = 'SQL_USER_PASSWORD_HASH' +################################################################################ +## Unleash +##! Docs: https://docs.gitlab.com/ee/user/project/operations/feature_flags.html +################################################################################ +# gitlab_rails['feature_flags_unleash_enabled'] = false +# gitlab_rails['feature_flags_unleash_url'] = nil +# gitlab_rails['feature_flags_unleash_app_name'] = nil +# gitlab_rails['feature_flags_unleash_instance_id'] = nil + ################################################################################ # Pgbouncer (EE only) # See [GitLab PgBouncer documentation](http://docs.gitlab.com/omnibus/settings/database.html#enabling-pgbouncer-ee-only) diff --git a/manifest.json b/manifest.json index 26f5bab..53311fe 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.4.1~ynh1", + "version": "12.5.0~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 9d27a59..f17d730 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.4.1" +gitlab_version="12.5.0" -gitlab_x86_64_source_sha256="c648d9b00ed5070a3cae6df508479380757040682ac71b7e43fb6466b1c2bb38" +gitlab_x86_64_source_sha256="b986d2214b11f6775b16360f6473ae06ad589ef4f7e1769a3f401032369db8b8" -gitlab_arm_source_sha256="9634c287b75e849c7424c1bbf9507ad7f63bef14f340c2ce156e39e64a38cea5" +gitlab_arm_source_sha256="e38bd488ee7ea2e9eebd5e7f6d2b804d7a5f1f4390c772afda585d015273e422" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 9e2bc199b32099ba1cfa9c49c3f71abe1e7916e7 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 28 Nov 2019 19:17:14 +0900 Subject: [PATCH 04/75] 12.5.2 --- README.md | 2 +- conf/gitlab.rb | 3 +++ manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c134f37..c61ba48 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.5.0 +**Shipped version:** 12.5.2 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 5a34fff..b18ed0e 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -1691,6 +1691,9 @@ grafana['enable'] = false # grafana['env'] = { # 'SSL_CERT_DIR' => "#{node['package']['install-dir']}/embedded/ssl/certs/" # } +# grafana['metrics_enabled'] = false +# grafana['metrics_basic_auth_username'] = 'grafana_metrics' # default: nil +# grafana['metrics_basic_auth_password'] = 'please_set_a_unique_password' # default: nil ### Dashboards # diff --git a/manifest.json b/manifest.json index 53311fe..702dcf6 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.5.0~ynh1", + "version": "12.5.2~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index f17d730..43aa73b 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.5.0" +gitlab_version="12.5.2" -gitlab_x86_64_source_sha256="b986d2214b11f6775b16360f6473ae06ad589ef4f7e1769a3f401032369db8b8" +gitlab_x86_64_source_sha256="fdf50eb4d2645ff00a8062d5af113bc778e32d9c8a6f1c442a9e52cd68d4a577" -gitlab_arm_source_sha256="e38bd488ee7ea2e9eebd5e7f6d2b804d7a5f1f4390c772afda585d015273e422" +gitlab_arm_source_sha256="7c9262ae07bf2539ea128253545220cd3b41b34a508a88eb731457d2a4f454f0" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 272c2b3b2d80e8868136dee5c0853909d2fc6d59 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 14 Dec 2019 15:30:27 +0900 Subject: [PATCH 05/75] 12.5.4 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c61ba48..a5cfec8 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.5.2 +**Shipped version:** 12.5.4 ## Screenshots diff --git a/manifest.json b/manifest.json index 702dcf6..fb39da6 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.5.2~ynh1", + "version": "12.5.4~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 43aa73b..e49ecd0 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.5.2" +gitlab_version="12.5.4" -gitlab_x86_64_source_sha256="fdf50eb4d2645ff00a8062d5af113bc778e32d9c8a6f1c442a9e52cd68d4a577" +gitlab_x86_64_source_sha256="f4322459222f65558d345ff048028e91fb21b40fd318eb702737103aa2b09c18" -gitlab_arm_source_sha256="7c9262ae07bf2539ea128253545220cd3b41b34a508a88eb731457d2a4f454f0" +gitlab_arm_source_sha256="382890913a38f942f060c604248b3337e6c1da7ee59fb32737617963fb8ce5d4" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From de095ec533626df1666e294e1810f9309571ce68 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 23 Dec 2019 10:33:29 +0800 Subject: [PATCH 06/75] 12.6.0 --- README.md | 2 +- conf/gitlab.rb | 50 ++++++++++++++++++++++++++----- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 ++-- 4 files changed, 47 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index a5cfec8..2b6a913 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.5.4 +**Shipped version:** 12.6.0 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index b18ed0e..d4fc9fa 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -124,6 +124,7 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['ci_archive_traces_cron_worker_cron'] = "17 * * * *" # gitlab_rails['repository_check_worker_cron'] = "20 * * * *" # gitlab_rails['admin_email_worker_cron'] = "0 0 * * 0" +# gitlab_rails['personal_access_tokens_expiring_worker_cron'] = "0 1 * * *" # gitlab_rails['repository_archive_cache_worker_cron'] = "0 * * * *" # gitlab_rails['pages_domain_verification_cron_worker'] = "*/15 * * * *" # gitlab_rails['pages_domain_ssl_renewal_cron_worker'] = "*/10 * * * *" @@ -209,11 +210,13 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['incoming_email_ssl'] = true # gitlab_rails['incoming_email_start_tls'] = false -#### Incoming Mailbox Settings +#### Incoming Mailbox Settings (via `mail_room`) ####! The mailbox where incoming mail will end up. Usually "inbox". # gitlab_rails['incoming_email_mailbox_name'] = "inbox" ####! The IDLE command timeout. # 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" ### Job Artifacts # gitlab_rails['artifacts_enabled'] = true @@ -505,6 +508,13 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # 'bantime' => 3600 # } +# Prioritize the Admin Area protected paths throttle settings over the +# deprecated Omnibus-managed protected paths throttle. This allows you to keep +# gitlab_rails['rack_attack_git_basic_auth'] enabled to run the Git and +# container registry failed authentication ban. +# See https://gitlab.com/gitlab-org/gitlab/issues/37093 +# gitlab_rails['rack_attack_admin_area_protected_paths_enabled'] = true + ###! **We do not recommend changing these directories.** # gitlab_rails['dir'] = "/var/opt/gitlab/gitlab-rails" # gitlab_rails['log_directory'] = "/var/log/gitlab/gitlab-rails" @@ -1636,6 +1646,7 @@ nginx['listen_https'] = false # postgres_exporter['env'] = { # 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/" # } +# postgres_exporter['sslmode'] = nil ################################################################################ ## Prometheus PgBouncer exporter (EE only) @@ -1810,16 +1821,39 @@ grafana['enable'] = false # praefect['prometheus_listen_addr'] = "localhost:9652" # praefect['logging_level'] = "warn" # praefect['logging_format'] = "json" -# praefect['storage_nodes'] = { -# 'praefect' => { -# 'address' => 'tcp://12:23:56:78', -# 'token' => 'abc123' +# praefect['virtual_storages'] = { +# 'default' => { +# 'praefect-internal-0' => { +# 'address' => 'tcp://10.23.56.78:8075', +# 'token' => 'abc123' +# }, +# 'praefect-internal-1' => { +# 'address' => 'tcp://10.76.23.31:8075', +# 'token' => 'xyz456' +# } # }, -# 'praefect-2' => { -# 'address' => 'tcp://praefect2.internal', -# 'token' => 'xyz456' +# 'alternative' => { +# 'praefect-internal-2' => { +# 'address' => 'tcp://10.34.1.16:8075', +# 'token' => 'abc321' +# }, +# 'praefect-internal-3' => { +# 'address' => 'tcp://10.23.18.6:8075', +# 'token' => 'xyz890' +# } # } # } +# praefect['sentry_dsn'] = "https://:@sentry.io/" +# praefect['sentry_environment'] = "production" +# praefect['database_host'] = 'postgres.internal' +# praefect['database_port'] = 5432 +# praefect['database_user'] = 'praefect' +# praefect['database_password'] = 'secret' +# praefect['database_dbname'] = 'praefect_production' +# praefect['database_sslmode'] = 'disable' +# praefect['database_sslcert'] = '/path/to/client-cert' +# praefect['database_sslkey'] = '/path/to/client-key' +# praefect['database_sslrootcert'] = '/path/to/rootcert' ################################################################################ # Storage check diff --git a/manifest.json b/manifest.json index fb39da6..03e1b38 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.5.4~ynh1", + "version": "12.6.0~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index e49ecd0..c14e169 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.5.4" +gitlab_version="12.6.0" -gitlab_x86_64_source_sha256="f4322459222f65558d345ff048028e91fb21b40fd318eb702737103aa2b09c18" +gitlab_x86_64_source_sha256="bedb43836d6f901ae72afec8aa0e94ac4ea99a70f9e652002eaf2f6289682dd3" -gitlab_arm_source_sha256="382890913a38f942f060c604248b3337e6c1da7ee59fb32737617963fb8ce5d4" +gitlab_arm_source_sha256="2a2f4725a6231f416d7a804897ee96ecdcbce621e51e6092e8d95afcf58958b1" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From e282c84059218a39a947e3194d8fff72d39e071e Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 4 Jan 2020 11:46:33 +0800 Subject: [PATCH 07/75] 12.6.2 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2b6a913..3ebf0a3 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.6.0 +**Shipped version:** 12.6.2 ## Screenshots diff --git a/manifest.json b/manifest.json index 03e1b38..4541f65 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.6.0~ynh1", + "version": "12.6.2~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index c14e169..62c48f9 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.6.0" +gitlab_version="12.6.2" -gitlab_x86_64_source_sha256="bedb43836d6f901ae72afec8aa0e94ac4ea99a70f9e652002eaf2f6289682dd3" +gitlab_x86_64_source_sha256="8550fc9fed49cb1f8e6f1e4d232752812bf530e53de23495e5710808f4b2fb61" -gitlab_arm_source_sha256="2a2f4725a6231f416d7a804897ee96ecdcbce621e51e6092e8d95afcf58958b1" +gitlab_arm_source_sha256="28df8fd5f5a1ba77a2214ff4bf3f32872d161ede8718eae1753bc90a23ef1b35" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 7e5bd5024384b1e2f55d4617ced545fe1e87fa97 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 14 Jan 2020 23:51:01 +0700 Subject: [PATCH 08/75] 12.6.4 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3ebf0a3..dfe0edb 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.6.2 +**Shipped version:** 12.6.4 ## Screenshots diff --git a/manifest.json b/manifest.json index 4541f65..5bc5219 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.6.2~ynh1", + "version": "12.6.4~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 62c48f9..3c36457 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.6.2" +gitlab_version="12.6.4" -gitlab_x86_64_source_sha256="8550fc9fed49cb1f8e6f1e4d232752812bf530e53de23495e5710808f4b2fb61" +gitlab_x86_64_source_sha256="9976a0e4c2c5022e5344f53f2303cc10bfd97a4d892b22422866196fe7d41d90" -gitlab_arm_source_sha256="28df8fd5f5a1ba77a2214ff4bf3f32872d161ede8718eae1753bc90a23ef1b35" +gitlab_arm_source_sha256="514d222b210e6d629182c889d1dd8121beeb544b7f06289cf3903da79857f4c1" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 33b5625be0adf2b183c1b3edf6e3f48108133447 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 23 Jan 2020 21:44:57 +0700 Subject: [PATCH 09/75] 12.7.0 --- README.md | 2 +- conf/gitlab.rb | 31 +++++++++++++++++-------------- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index dfe0edb..acc552e 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.6.4 +**Shipped version:** 12.7.0 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index d4fc9fa..0c4edca 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -37,6 +37,12 @@ ##! URL on which GitLab will be reachable. ##! For more details on configuring external_url see: ##! https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab +##! +##! Note: During installation/upgrades, the value of the environment variable +##! EXTERNAL_URL will be used to populate/replace this value. +##! On AWS EC2 instances, we also attempt to fetch the public hostname/IP +##! address from AWS. For more details, see: +##! https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-data-retrieval.html external_url '__GENERATED_EXTERNAL_URL__' ## Roles for multi-instance GitLab @@ -73,6 +79,12 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['gitlab_ssh_host'] = 'ssh.host_example.com' # gitlab_rails['time_zone'] = 'UTC' +### Request duration +###! Tells the rails application how long it has to complete a request +###! This value needs to be lower than the worker timeout set in unicorn/puma. +###! By default, we'll allow 95% of the the worker timeout +# gitlab_rails['max_request_duration_seconds'] = 57 + ### Email Settings # gitlab_rails['gitlab_email_enabled'] = true # gitlab_rails['gitlab_email_from'] = 'example@example.com' @@ -215,7 +227,7 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['incoming_email_mailbox_name'] = "inbox" ####! The IDLE command timeout. # gitlab_rails['incoming_email_idle_timeout'] = 60 -####! The file name for internal `mail_room`JSON logfile +####! The file name for internal `mail_room` JSON logfile # gitlab_rails['incoming_email_log_file'] = "/var/log/gitlab/mailroom/mail_room_json.log" ### Job Artifacts @@ -797,10 +809,10 @@ unicorn['port'] = __UNICORN_PORT__ # unicorn['log_directory'] = "/var/log/gitlab/unicorn" ### **Only change these settings if you understand well what they mean** -###! Docs: https://about.gitlab.com/2015/06/05/how-gitlab-uses-unicorn-and-unicorn-worker-killer/ +###! Docs: https://docs.gitlab.com/ee/administration/operations/unicorn.html#unicorn-worker-killer ###! https://github.com/kzk/unicorn-worker-killer -# unicorn['worker_memory_limit_min'] = "400 * 1 << 20" -# unicorn['worker_memory_limit_max'] = "650 * 1 << 20" +# unicorn['worker_memory_limit_min'] = "1024 * 1 << 20" +# unicorn['worker_memory_limit_max'] = "1280 * 1 << 20" # unicorn['exporter_enabled'] = false # unicorn['exporter_address'] = "127.0.0.1" @@ -1788,16 +1800,6 @@ grafana['enable'] = false # gitaly['ruby_restart_delay'] = '5m' # Period of sustained high RSS that needs to be observed before restarting gitaly-ruby # gitaly['ruby_rugged_git_config_search_path'] = "/opt/gitlab/embedded/etc" # Location of system-wide gitconfig file # gitaly['ruby_num_workers'] = 3 # Number of gitaly-ruby worker processes. Minimum 2, default 2. -# gitaly['storage'] = [ -# { -# 'name' => 'default', -# 'path' => '/mnt/nfs-01/git-data/repositories' -# }, -# { -# 'name' => 'secondary', -# 'path' => '/mnt/nfs-02/git-data/repositories' -# } -# ] # gitaly['concurrency'] = [ # { # 'rpc' => "/gitaly.SmartHTTPService/PostReceivePack", @@ -1819,6 +1821,7 @@ grafana['enable'] = false # praefect['auth_transitioning'] = false # praefect['listen_addr'] = "localhost:2305" # 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" # praefect['logging_format'] = "json" # praefect['virtual_storages'] = { diff --git a/manifest.json b/manifest.json index 5bc5219..86cf149 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.6.4~ynh1", + "version": "12.7.0~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 3c36457..6fac174 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.6.4" +gitlab_version="12.7.0" -gitlab_x86_64_source_sha256="9976a0e4c2c5022e5344f53f2303cc10bfd97a4d892b22422866196fe7d41d90" +gitlab_x86_64_source_sha256="ff5c4f53f70f3db5499a6544e9ffc0998761b4f85d1544988f84e965058ea22b" -gitlab_arm_source_sha256="514d222b210e6d629182c889d1dd8121beeb544b7f06289cf3903da79857f4c1" +gitlab_arm_source_sha256="3518735ce086ecedb2fe2841ea717b0325bb99418a7d32e1cc87ce169815624e" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 421a06d3329b7c68f670be92a06bf1a280cfb543 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 31 Jan 2020 14:15:39 +0700 Subject: [PATCH 10/75] 12.7.4 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index acc552e..332eece 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.7.0 +**Shipped version:** 12.7.4 ## Screenshots diff --git a/manifest.json b/manifest.json index 86cf149..6202b80 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.7.0~ynh1", + "version": "12.7.4~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 6fac174..9687ca7 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.7.0" +gitlab_version="12.7.4" -gitlab_x86_64_source_sha256="ff5c4f53f70f3db5499a6544e9ffc0998761b4f85d1544988f84e965058ea22b" +gitlab_x86_64_source_sha256="d6e425ffd161f763a442ed8e039d3fa6d1fb051d5bc7a36aae765c265d39b0c1" -gitlab_arm_source_sha256="3518735ce086ecedb2fe2841ea717b0325bb99418a7d32e1cc87ce169815624e" +gitlab_arm_source_sha256="2605a2253a80e5bf13aa675bee991ffc1f6a4b14adb977af80e8a5edfdc5cdd6" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 89da7af6ae9e5b71c200faea5a5ef976bed32a6d Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 15 Feb 2020 09:31:37 +0700 Subject: [PATCH 11/75] 12.7.6 --- README.md | 2 +- conf/gitlab.rb | 18 ++++++++++++++++-- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 332eece..c3c8c54 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.7.4 +**Shipped version:** 12.7.6 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 0c4edca..83632ba 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -148,6 +148,12 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! request (default: 10) # gitlab_rails['webhook_timeout'] = 10 +### GraphQL Settings +###! Tells the rails application how long it has to complete a GraphQL request. +###! We suggest this value to be higher than the database timeout value +###! and lower than the worker timeout set in unicorn/puma. (default: 30) +# gitlab_rails['graphql_timeout'] = 30 + ### Trusted proxies ###! Customize if you have GitLab behind a reverse proxy which is running on a ###! different machine. @@ -1393,6 +1399,12 @@ nginx['listen_https'] = false # gitlab_pages['gitlab_server'] = nil # Defaults to external_url # gitlab_pages['auth_secret'] = nil # Generated if not present +##! GitLab API HTTP client connection timeout +# gitlab_pages['gitlab_client_http_timeout'] = "10s" + +##! GitLab API JWT Token expiry time" +# gitlab_pages['gitlab_client_jwt_expiry'] = "30s" + ##! Define custom gitlab-pages HTTP headers for the whole instance # gitlab_pages['headers'] = [] @@ -1780,8 +1792,8 @@ grafana['enable'] = false # gitaly['internal_socket_dir'] = "/var/opt/gitlab/gitaly" # gitaly['socket_path'] = "/var/opt/gitlab/gitaly/gitaly.socket" # gitaly['listen_addr'] = "localhost:8075" -# gitaly['tls_listen_addr] = "localhost:9075" -# gitaly['certificate_path'] = "/var/opt/gitlab/gitaly/certificate.pem' +# gitaly['tls_listen_addr'] = "localhost:9075" +# gitaly['certificate_path'] = "/var/opt/gitlab/gitaly/certificate.pem" # gitaly['key_path'] = "/var/opt/gitlab/gitaly/key.pem" # gitaly['prometheus_listen_addr'] = "localhost:9236" # gitaly['logging_level'] = "warn" @@ -1906,6 +1918,7 @@ grafana['enable'] = false # # gitlab_rails['geo_file_download_dispatch_worker_cron'] = "*/10 * * * *" # gitlab_rails['geo_repository_sync_worker_cron'] = "*/5 * * * *" +# gitlab_rails['geo_secondary_registry_consistency_worker'] = "* * * * *" # 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 * * * *" @@ -2056,6 +2069,7 @@ grafana['enable'] = false # sidekiq_cluster['log_directory'] = "/var/log/gitlab/sidekiq-cluster" # sidekiq_cluster['interval'] = 5 # The number of seconds to wait between worker checks # sidekiq_cluster['max_concurrency'] = 50 # The maximum number of threads each Sidekiq process should run +# sidekiq_cluster['min_concurrency'] = 0 # The minimum number of threads each Sidekiq process should run ##! Each entry in the queue_groups array denotes a group of queues that have to be processed by a ##! Sidekiq process. Multiple queues can be processed by the same process by diff --git a/manifest.json b/manifest.json index 6202b80..427d033 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.7.4~ynh1", + "version": "12.7.6~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 9687ca7..06d17a3 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.7.4" +gitlab_version="12.7.6" -gitlab_x86_64_source_sha256="d6e425ffd161f763a442ed8e039d3fa6d1fb051d5bc7a36aae765c265d39b0c1" +gitlab_x86_64_source_sha256="b2452d5d83120b4226a3a26c4e1fa8a0cb2ac62833d971f32b3d844c70073a44" -gitlab_arm_source_sha256="2605a2253a80e5bf13aa675bee991ffc1f6a4b14adb977af80e8a5edfdc5cdd6" +gitlab_arm_source_sha256="1ca5be46e17784119b6714e5a5f8f0688da11f493f8a1cd847e47ef7c58c0554" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From b45316cfb75d5adcfa1ae45a63125dbd861c4ded Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 22 Feb 2020 19:16:31 +0100 Subject: [PATCH 12/75] 12.8.0 --- README.md | 2 +- conf/gitlab.rb | 1 + manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c3c8c54..ffe4b49 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.7.6 +**Shipped version:** 12.8.0 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 83632ba..8b023a7 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -132,6 +132,7 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! https://docs.gitlab.com/ee/ci/yaml/README.html#artifacts:expire_in # gitlab_rails['stuck_ci_jobs_worker_cron'] = "0 0 * * *" # gitlab_rails['expire_build_artifacts_worker_cron'] = "50 * * * *" +# gitlab_rails['environments_auto_stop_cron_worker_cron'] = "24 * * * *" # gitlab_rails['pipeline_schedule_worker_cron'] = "19 * * * *" # gitlab_rails['ci_archive_traces_cron_worker_cron'] = "17 * * * *" # gitlab_rails['repository_check_worker_cron'] = "20 * * * *" diff --git a/manifest.json b/manifest.json index 427d033..2e52532 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.7.6~ynh1", + "version": "12.8.0~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 06d17a3..738f09a 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.7.6" +gitlab_version="12.8.0" -gitlab_x86_64_source_sha256="b2452d5d83120b4226a3a26c4e1fa8a0cb2ac62833d971f32b3d844c70073a44" +gitlab_x86_64_source_sha256="bc8a47a29a16fbeb77163a9fb6ae77f556504f76c2617ca7c5985752f30c84fe" -gitlab_arm_source_sha256="1ca5be46e17784119b6714e5a5f8f0688da11f493f8a1cd847e47ef7c58c0554" +gitlab_arm_source_sha256="89d0db6632fe74b052708c6a641bb8d9b192e343e89cd91b87468265eca22ba0" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 1ccae1e7eee522f5d0a3a3cc874a669e69b80da2 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 25 Feb 2020 13:10:55 +0100 Subject: [PATCH 13/75] 12.8.1 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ffe4b49..227471e 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.8.0 +**Shipped version:** 12.8.1 ## Screenshots diff --git a/manifest.json b/manifest.json index 2e52532..b89388c 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.8.0~ynh1", + "version": "12.8.1~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 738f09a..a1d9ab1 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.8.0" +gitlab_version="12.8.1" -gitlab_x86_64_source_sha256="bc8a47a29a16fbeb77163a9fb6ae77f556504f76c2617ca7c5985752f30c84fe" +gitlab_x86_64_source_sha256="46ce55698d75c29e1a8558f757f56361c738420a878e30f2854731761378e746" -gitlab_arm_source_sha256="89d0db6632fe74b052708c6a641bb8d9b192e343e89cd91b87468265eca22ba0" +gitlab_arm_source_sha256="ce3ff5209a56f0d50555dbd9f82f26c30e8b04a0f19b3d829e545c14a07c4813" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 19e99b4e9d0dccdf91a90f9370c3704157e47b65 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 6 Mar 2020 23:48:36 +0100 Subject: [PATCH 14/75] 12.8.2 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 227471e..5026fa9 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.8.1 +**Shipped version:** 12.8.2 ## Screenshots diff --git a/manifest.json b/manifest.json index b89388c..d69871e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.8.1~ynh1", + "version": "12.8.2~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index a1d9ab1..f9c7a86 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.8.1" +gitlab_version="12.8.2" -gitlab_x86_64_source_sha256="46ce55698d75c29e1a8558f757f56361c738420a878e30f2854731761378e746" +gitlab_x86_64_source_sha256="6c45ab23f3b7abc927ac15035ace7bdf1692c65b5bb657686b8cc23f7fdcd6d7" -gitlab_arm_source_sha256="ce3ff5209a56f0d50555dbd9f82f26c30e8b04a0f19b3d829e545c14a07c4813" +gitlab_arm_source_sha256="1476be7c19f85d90c6abf1254ba1f2d4380833934e2471f788d5179099eb1122" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From df5c0386927fff836d2c889c605ae0ff7c187095 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 10 Mar 2020 09:50:17 +0100 Subject: [PATCH 15/75] 12.8.5 --- README.md | 2 +- conf/gitlab.rb | 6 ++++++ manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5026fa9..27c4d3a 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.8.2 +**Shipped version:** 12.8.5 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 8b023a7..c9bdc45 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -916,6 +916,11 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # postgresql['ha'] = false # postgresql['dir'] = "/var/opt/gitlab/postgresql" # postgresql['log_directory'] = "/var/log/gitlab/postgresql" +# postgresql['log_destination'] = nil +# postgresql['logging_collector'] = nil +# postgresql['log_truncate_on_rotation'] = nil +# postgresql['log_rotation_age'] = nil +# postgresql['log_rotation_size'] = nil # postgresql['username'] = "gitlab-psql" # postgresql['group'] = "gitlab-psql" ##! `SQL_USER_PASSWORD_HASH` can be generated using the command `gitlab-ctl pg-password-md5 gitlab` @@ -1928,6 +1933,7 @@ grafana['enable'] = false # gitlab_rails['ldap_group_sync_worker_cron'] = "0 * * * *" # gitlab_rails['historical_data_worker_cron'] = "0 12 * * *" # gitlab_rails['pseudonymizer_worker_cron'] = "0 23 * * *" +# gitlab_rails['elastic_index_bulk_cron'] = "*/1 * * * *" ################################################################################ ## Kerberos (EE Only) diff --git a/manifest.json b/manifest.json index d69871e..84a058f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.8.2~ynh1", + "version": "12.8.5~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index f9c7a86..0f6d9a1 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.8.2" +gitlab_version="12.8.5" -gitlab_x86_64_source_sha256="6c45ab23f3b7abc927ac15035ace7bdf1692c65b5bb657686b8cc23f7fdcd6d7" +gitlab_x86_64_source_sha256="ef9a55ca32f0d2450ce34f355debc01f3fcebc48ed389fd3ac82c76773bf7ec7" -gitlab_arm_source_sha256="1476be7c19f85d90c6abf1254ba1f2d4380833934e2471f788d5179099eb1122" +gitlab_arm_source_sha256="0fcb4b715430ac8b94eff186909d59de50188e33957ffdb6f30b11ca87bd80a6" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 05e3d76e2d62fb3163dd02ac193c3cdfcce3d670 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 13 Mar 2020 11:12:47 +0100 Subject: [PATCH 16/75] 12.8.6 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 27c4d3a..80c8f60 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.8.5 +**Shipped version:** 12.8.6 ## Screenshots diff --git a/manifest.json b/manifest.json index 84a058f..21e87b2 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.8.5~ynh1", + "version": "12.8.6~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 0f6d9a1..091a085 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.8.5" +gitlab_version="12.8.6" -gitlab_x86_64_source_sha256="ef9a55ca32f0d2450ce34f355debc01f3fcebc48ed389fd3ac82c76773bf7ec7" +gitlab_x86_64_source_sha256="38ad319f529d6fd7166a421077ee0d5e42f299443fe81a071523ed5da0213b13" -gitlab_arm_source_sha256="0fcb4b715430ac8b94eff186909d59de50188e33957ffdb6f30b11ca87bd80a6" +gitlab_arm_source_sha256="8b9e1f55d13113006071d7da074e5b934258c6a8618c59a98a37d11e298a55e7" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From c8e25ae0920f2d85bea2c4cce66ffe447ef76e7c Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 23 Mar 2020 01:47:21 +0100 Subject: [PATCH 17/75] 12.9.0 --- README.md | 2 +- conf/gitlab.rb | 8 +++++++- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 80c8f60..fca6e04 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.8.6 +**Shipped version:** 12.9.0 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index c9bdc45..3decff9 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -77,6 +77,7 @@ external_url '__GENERATED_EXTERNAL_URL__' ##! Docs: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/gitlab.yml.md ################################################################################ # gitlab_rails['gitlab_ssh_host'] = 'ssh.host_example.com' +# gitlab_rails['gitlab_ssh_user'] = '' # gitlab_rails['time_zone'] = 'UTC' ### Request duration @@ -129,7 +130,7 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! Periodically executed jobs, to self-heal Gitlab, do external ###! synchronizations, etc. ###! Docs: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job -###! https://docs.gitlab.com/ee/ci/yaml/README.html#artifacts:expire_in +###! https://docs.gitlab.com/ee/ci/yaml/README.html#artifactsexpire_in # gitlab_rails['stuck_ci_jobs_worker_cron'] = "0 0 * * *" # gitlab_rails['expire_build_artifacts_worker_cron'] = "50 * * * *" # gitlab_rails['environments_auto_stop_cron_worker_cron'] = "24 * * * *" @@ -237,6 +238,9 @@ external_url '__GENERATED_EXTERNAL_URL__' ####! The file name for internal `mail_room` JSON logfile # gitlab_rails['incoming_email_log_file'] = "/var/log/gitlab/mailroom/mail_room_json.log" +####! The format of mail_room crash logs +# mailroom['exit_log_format'] = "plain" + ### Job Artifacts # gitlab_rails['artifacts_enabled'] = true # gitlab_rails['artifacts_path'] = "/var/opt/gitlab/gitlab-rails/shared/artifacts" @@ -405,6 +409,7 @@ EOS ###! Docs: https://docs.gitlab.com/ee/administration/auth/smartcard.html # gitlab_rails['smartcard_enabled'] = false # gitlab_rails['smartcard_ca_file'] = "/etc/gitlab/ssl/CA.pem" +# gitlab_rails['smartcard_client_certificate_required_host'] = 'smartcard.gitlab.example.com' # gitlab_rails['smartcard_client_certificate_required_port'] = 3444 # gitlab_rails['smartcard_required_for_git_access'] = false # gitlab_rails['smartcard_san_extensions'] = false @@ -1835,6 +1840,7 @@ grafana['enable'] = false # praefect['enable'] = false # praefect['virtual_storage_name'] = "praefect" +# praefect['failover_enabled'] = false # praefect['auth_token'] = "" # praefect['auth_transitioning'] = false # praefect['listen_addr'] = "localhost:2305" diff --git a/manifest.json b/manifest.json index 21e87b2..53a0251 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.8.6~ynh1", + "version": "12.9.0~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 091a085..38a0345 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.8.6" +gitlab_version="12.9.0" -gitlab_x86_64_source_sha256="38ad319f529d6fd7166a421077ee0d5e42f299443fe81a071523ed5da0213b13" +gitlab_x86_64_source_sha256="fe547cd70cbc8cb89314e4ee69c96100cc34d9df476ba021ce5c036bb28bf501" -gitlab_arm_source_sha256="8b9e1f55d13113006071d7da074e5b934258c6a8618c59a98a37d11e298a55e7" +gitlab_arm_source_sha256="5865793add5e88c30d517234bd25795a489fa82f560406fbf715e460611e8a0f" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 6e36401fc38257e8b229568651766684525da7af Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 27 Mar 2020 22:28:57 +0100 Subject: [PATCH 18/75] 12.9.1 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fca6e04..650127e 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.9.0 +**Shipped version:** 12.9.1 ## Screenshots diff --git a/manifest.json b/manifest.json index 53a0251..c4930b1 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.9.0~ynh1", + "version": "12.9.1~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 38a0345..6271519 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.9.0" +gitlab_version="12.9.1" -gitlab_x86_64_source_sha256="fe547cd70cbc8cb89314e4ee69c96100cc34d9df476ba021ce5c036bb28bf501" +gitlab_x86_64_source_sha256="57f38c95abce48211a51fd6f58f3adc7aab367690f4e860f821e60b2e42a27f5" -gitlab_arm_source_sha256="5865793add5e88c30d517234bd25795a489fa82f560406fbf715e460611e8a0f" +gitlab_arm_source_sha256="37190935887455ee296f09c15b5ffce7c6077151ebdae45a0b5b175c22996695" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 11b31142fa6c915aedeb7106a818df5e12f40c85 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 28 Mar 2020 21:28:05 +0100 Subject: [PATCH 19/75] Add badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 650127e..85b3256 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Gitlab for Yunohost -[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) +[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab)![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) [![Install gitlab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab) > *This package allow you to install gitlab quickly and simply on a YunoHost server. From 5b2d8553f3a233b5909dd38b79ccbbe9d9e39f68 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 28 Mar 2020 21:28:44 +0100 Subject: [PATCH 20/75] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85b3256..3a24289 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Gitlab for Yunohost -[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab)![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) [![Install gitlab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab) > *This package allow you to install gitlab quickly and simply on a YunoHost server. From a3659c59704a494c374b02ed461870a8778d66d7 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 2 Apr 2020 13:47:53 +0200 Subject: [PATCH 21/75] 12.9.2 --- README.md | 2 +- conf/gitlab.rb | 4 ++++ manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3a24289..1c5cc25 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.9.1 +**Shipped version:** 12.9.2 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 3decff9..cc49018 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -331,6 +331,10 @@ external_url '__GENERATED_EXTERNAL_URL__' ### Usage Statistics # gitlab_rails['usage_ping_enabled'] = true +### Seat Link setting +###! Docs: https://docs.gitlab.com/ee/subscriptions/index.html#seat-link +# gitlab_rails['seat_link_enabled'] = true + ### GitLab Mattermost ###! These settings are void if Mattermost is installed on the same omnibus ###! install diff --git a/manifest.json b/manifest.json index c4930b1..03e0db3 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.9.1~ynh1", + "version": "12.9.2~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 6271519..1f51378 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.9.1" +gitlab_version="12.9.2" -gitlab_x86_64_source_sha256="57f38c95abce48211a51fd6f58f3adc7aab367690f4e860f821e60b2e42a27f5" +gitlab_x86_64_source_sha256="781d21de10c4b88582d25af19cd3d85d9618a995f930d1954ea9dc0fa76d7ea9" -gitlab_arm_source_sha256="37190935887455ee296f09c15b5ffce7c6077151ebdae45a0b5b175c22996695" +gitlab_arm_source_sha256="09eb415d2e55af64294606e25cfebd508c8cc59218475ed26e99f6baccfe1218" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 52a39e86592cd34e50d76163f2e0f3d030f241a4 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 16 Apr 2020 12:19:20 +0200 Subject: [PATCH 22/75] 12.9.3 --- README.md | 2 +- conf/gitlab.rb | 2 +- conf/nginx.conf | 26 +++++++++++++++++++------- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 1c5cc25..d375638 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.9.2 +**Shipped version:** 12.9.3 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index cc49018..9c8711d 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -1726,7 +1726,7 @@ nginx['listen_https'] = false ##! Docs: https://docs.gitlab.com/ee/administration/monitoring/prometheus/#prometheus-as-a-grafana-data-source ################################################################################ -grafana['enable'] = false +# grafana['enable'] = true # grafana['log_directory'] = '/var/log/gitlab/grafana' # grafana['home'] = '/var/opt/gitlab/grafana' # grafana['admin_password'] = 'admin' diff --git a/conf/nginx.conf b/conf/nginx.conf index 9d0c3db..21d6e44 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,13 +1,25 @@ location __PATH__/ { - proxy_pass http://localhost:__PORT__; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Ssl on; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; + # Adapted from https://gitlab.com/gitlab-org/gitlab-recipes/blob/master/web-server/nginx/gitlab-omnibus-ssl-nginx.conf client_max_body_size __CLIENT_MAX_BODY_SIZE__; + gzip off; + ## https://github.com/gitlabhq/gitlabhq/issues/694 + ## Some requests take more than 30 seconds. + proxy_read_timeout 300; + proxy_connect_timeout 300; + proxy_redirect off; + + proxy_http_version 1.1; + + proxy_pass http://localhost:__PORT__; + + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Ssl on; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; - proxy_set_header Accept-Encoding ""; } diff --git a/manifest.json b/manifest.json index 03e0db3..1510ae8 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.9.2~ynh1", + "version": "12.9.3~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 1f51378..0b829ca 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.9.2" +gitlab_version="12.9.3" -gitlab_x86_64_source_sha256="781d21de10c4b88582d25af19cd3d85d9618a995f930d1954ea9dc0fa76d7ea9" +gitlab_x86_64_source_sha256="8260f00f7fcda9118155244415fd865fa53e41bb29047421d06f04a2b249e6f9" -gitlab_arm_source_sha256="09eb415d2e55af64294606e25cfebd508c8cc59218475ed26e99f6baccfe1218" +gitlab_arm_source_sha256="1f99fd0d5d11a3a41cd1e3c018bdf2566a0085999111076c43fca31ff4d1cac1" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 30ad99c10007d092b424487e324a57be4b6cdff6 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 16 Apr 2020 12:20:59 +0200 Subject: [PATCH 23/75] reorder source --- scripts/upgrade | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index bd1f854..8fb06b7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -6,12 +6,9 @@ # IMPORT GENERIC HELPERS #================================================= -# IMPORT GENERIC HELPERS +source _common.sh source /usr/share/yunohost/helpers -# Load common variables and helpers -source ./_common.sh - #================================================= # LOAD SETTINGS #================================================= From 69f59b6c388f15d6e01951c51bdd093fe2f10628 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 22 Apr 2020 19:31:44 +0200 Subject: [PATCH 24/75] 12.10.0 --- README.md | 2 +- conf/gitlab.rb | 55 ++++++++++++++++++++++++++++--- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 ++-- 4 files changed, 55 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d375638..1f4117d 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.9.3 +**Shipped version:** 12.10.0 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 9c8711d..66c2677 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -325,6 +325,24 @@ external_url '__GENERATED_EXTERNAL_URL__' # # 'path_style' => false # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' # } +### Terraform state +###! Docs: https://docs.gitlab.com/ee/administration/terraform_state +# gitlab_rails['terraform_state_enabled'] = true +# gitlab_rails['terraform_state_storage_path'] = "/var/opt/gitlab/gitlab-rails/shared/terraform_state" +# gitlab_rails['terraform_state_object_store_enabled'] = false +# gitlab_rails['terraform_state_object_store_remote_directory'] = "terraform_state" +# gitlab_rails['terraform_state_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' +# } + ### Impersonation settings # gitlab_rails['impersonation_enabled'] = true @@ -625,6 +643,8 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['redis_queues_sentinels'] = nil # gitlab_rails['redis_shared_state_instance'] = nil # gitlab_rails['redis_shared_sentinels'] = nil +# gitlab_rails['redis_actioncable_instance'] = nil +# gitlab_rails['redis_actioncable_sentinels'] = nil ### GitLab email server settings ###! Docs: https://docs.gitlab.com/omnibus/settings/smtp.html @@ -844,8 +864,8 @@ unicorn['port'] = __UNICORN_PORT__ # puma['ha'] = false # puma['worker_timeout'] = 60 # puma['worker_processes'] = 2 -# puma['min_threads'] = 1 -# puma['max_threads'] = 16 +# puma['min_threads'] = 4 +# puma['max_threads'] = 4 ### Advanced settings # puma['listen'] = '127.0.0.1' @@ -877,6 +897,17 @@ unicorn['port'] = __UNICORN_PORT__ # sidekiq['listen_address'] = "localhost" sidekiq['listen_port'] = __SIDEKIQ_PORT__ +### Experimental Sidekiq Cluster settings +###! These settings allow starting `sidekiq-cluster` instead of sidekiq. +###! Docs: https://docs.gitlab.com/ee/administration/operations/extra_sidekiq_processes.html#using-sidekiq-cluster-by-default-experimental +# sidekiq['cluster'] = false +# sidekiq['experimental_queue_selector'] = false +# sidekiq['interval'] = nil +# sidekiq['max_concurrency'] = nil +# sidekiq['min_concurrency'] = nil +# sidekiq['negate'] = false +# sidekiq['queue_groups'] = ['*'] + ################################################################################ ## gitlab-shell ################################################################################ @@ -1124,6 +1155,13 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ #####! Set to [''] to clear previously set values # redis['save'] = [ '900 1', '300 10', '60 10000' ] +#####! Redis lazy freeing +#####! Defaults to false +# redis['lazyfree_lazy_eviction'] = true +# redis['lazyfree_lazy_expire'] = true +# redis['lazyfree_lazy_server_del'] = true +# redis['replica_lazy_flush'] = true + ################################################################################ ## GitLab Web server ##! Docs: https://docs.gitlab.com/omnibus/settings/nginx.html#using-a-non-bundled-web-server @@ -1336,10 +1374,15 @@ nginx['listen_https'] = false ##! { "receive" => ["fsckObjects = true"], "alias" => ["st = status", "co = checkout"] } # omnibus_gitconfig['system'] = { -# "pack" => ["threads = 1"], +# "pack" => ["threads = 1", "useSparse = true"], # "receive" => ["fsckObjects = true", "advertisePushOptions = true"], # "repack" => ["writeBitmaps = true"], # "transfer" => ["hideRefs=^refs/tmp/", "hideRefs=^refs/keep-around/", "hideRefs=^refs/remotes/"], +# "core" => [ +# 'alternateRefsCommand="exit 0 #"', +# "fsyncObjectFiles = true" +# ], +# "fetch" => ["writeCommitGraph = true"] # } ################################################################################ @@ -1845,9 +1888,11 @@ nginx['listen_https'] = false # praefect['enable'] = false # praefect['virtual_storage_name'] = "praefect" # praefect['failover_enabled'] = false +# praefect['failover_election_strategy'] = 'local' # praefect['auth_token'] = "" # praefect['auth_transitioning'] = false # praefect['listen_addr'] = "localhost:2305" +# praefect['postgres_queue_enabled'] = false # 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" @@ -2286,7 +2331,7 @@ nginx['listen_https'] = false # repmgr['node_number'] = nil # repmgr['port'] = 5432 # repmgr['trust_auth_cidr_addresses'] = [] -# repmgr['user'] = 'gitlab_repmgr' +# repmgr['username'] = 'gitlab_repmgr' # repmgr['sslmode'] = 'prefer' # repmgr['sslcompression'] = 0 # repmgr['failover'] = 'automatic' @@ -2331,7 +2376,7 @@ nginx['listen_https'] = false ################################################################################ # consul['enable'] = false # consul['dir'] = '/var/opt/gitlab/consul' -# consul['user'] = 'gitlab-consul' +# consul['username'] = 'gitlab-consul' # consul['group'] = 'gitlab-consul' # consul['config_file'] = '/var/opt/gitlab/consul/config.json' # consul['config_dir'] = '/var/opt/gitlab/consul/config.d' diff --git a/manifest.json b/manifest.json index 1510ae8..7beffa0 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.9.3~ynh1", + "version": "12.10.0~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 0b829ca..34d19c5 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.9.3" +gitlab_version="12.10.0" -gitlab_x86_64_source_sha256="8260f00f7fcda9118155244415fd865fa53e41bb29047421d06f04a2b249e6f9" +gitlab_x86_64_source_sha256="ed24c9bd072b6f15f7c73367df04acba3e64ee53bb3562f25e768a2dda533ca2" -gitlab_arm_source_sha256="1f99fd0d5d11a3a41cd1e3c018bdf2566a0085999111076c43fca31ff4d1cac1" +gitlab_arm_source_sha256="5d4b1d76997de08e9707e5cb17445a38ed832bd9995f31a5af0b87134b7f0834" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From a762e4bb50383a136397d45756d232d030129f5b Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 22 Apr 2020 19:36:44 +0200 Subject: [PATCH 25/75] Add buster image --- scripts/upgrade.d/upgrade.last.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 34d19c5..a765708 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,6 +1,13 @@ gitlab_version="12.10.0" -gitlab_x86_64_source_sha256="ed24c9bd072b6f15f7c73367df04acba3e64ee53bb3562f25e768a2dda533ca2" +# sha256sum found here: https://packages.gitlab.com/gitlab + +if [ "$(lsb_release -sc)" = "buster" ] +then + gitlab_x86_64_source_sha256="01d8d1dd2e4ed9a378317f55ab46174d6bd77e4eb1be32d87fe7911da8f65381" +else + gitlab_x86_64_source_sha256="ed24c9bd072b6f15f7c73367df04acba3e64ee53bb3562f25e768a2dda533ca2" +fi gitlab_arm_source_sha256="5d4b1d76997de08e9707e5cb17445a38ed832bd9995f31a5af0b87134b7f0834" From 516d3a7715eaf7303ae08bcb9487ba68d68be272 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 22 Apr 2020 19:50:43 +0200 Subject: [PATCH 26/75] add debian_version for x86_64 --- conf/x86-64.src.default | 2 +- scripts/install | 1 + scripts/restore | 1 + scripts/upgrade | 1 + scripts/upgrade.d/upgrade.11.sh | 3 +++ scripts/upgrade.d/upgrade.last.sh | 2 ++ 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/conf/x86-64.src.default b/conf/x86-64.src.default index 927df9e..b33624e 100644 --- a/conf/x86-64.src.default +++ b/conf/x86-64.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/scripts/install b/scripts/install index 05816fa..dafce4c 100644 --- a/scripts/install +++ b/scripts/install @@ -178,6 +178,7 @@ ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitla if [ $architecture = "x86-64" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_x86_64_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_verion" --target_file="../conf/$architecture.src" elif [ $architecture = "arm" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_arm_source_sha256" --target_file="../conf/$architecture.src" fi diff --git a/scripts/restore b/scripts/restore index 9914ebb..0b6c49e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -107,6 +107,7 @@ ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitla if [ $architecture = "x86-64" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_x86_64_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_verion" --target_file="../conf/$architecture.src" elif [ $architecture = "arm" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_arm_source_sha256" --target_file="../conf/$architecture.src" fi diff --git a/scripts/upgrade b/scripts/upgrade index 8fb06b7..b3a282b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -267,6 +267,7 @@ then if [ $architecture = "x86-64" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_x86_64_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_verion" --target_file="../conf/$architecture.src" elif [ $architecture = "arm" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_arm_source_sha256" --target_file="../conf/$architecture.src" fi diff --git a/scripts/upgrade.d/upgrade.11.sh b/scripts/upgrade.d/upgrade.11.sh index 64724d0..69b1f93 100644 --- a/scripts/upgrade.d/upgrade.11.sh +++ b/scripts/upgrade.d/upgrade.11.sh @@ -1,5 +1,8 @@ gitlab_version="11.11.5" +# There is no buster version for gitlab 11.X +gitlab_x86_64_debian_verion="stretch" + gitlab_x86_64_source_sha256="1ee3d6e8d2cc198f5466de0884c03f6016299db24859126af9a191501dbdef10" gitlab_arm_source_sha256="366e12b1f3d3b1694fcb6f13da9de908360ba93f75768d97e8d01e61e8652705" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index a765708..77224b6 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -9,6 +9,8 @@ else gitlab_x86_64_source_sha256="ed24c9bd072b6f15f7c73367df04acba3e64ee53bb3562f25e768a2dda533ca2" fi +gitlab_x86_64_debian_verion="$(lsb_release -sc)" + gitlab_arm_source_sha256="5d4b1d76997de08e9707e5cb17445a38ed832bd9995f31a5af0b87134b7f0834" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 3e4b978e725f44a482e15a26aab38e5bb6c033ef Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 22 Apr 2020 21:53:25 +0200 Subject: [PATCH 27/75] fix install --- scripts/upgrade.d/upgrade.last.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 77224b6..69c40f5 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -18,8 +18,8 @@ gitlab_filename="gitlab-ce-${gitlab_version}.deb" # Action to do in case of failure of the package_check package_check_action() { local sysctl_file="$final_path/embedded/cookbooks/package/resources/gitlab_sysctl.rb" - if [ ! -f "$sysctl_file" ]; then - sysctl_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb" - fi - ynh_replace_string --match_string="command \"sysctl -e --system\"" --replace_string="command \"sysctl -e --system || true\"" --target_file=$sysctl_file + ynh_replace_string --match_string="command \"sysctl -e \(.*\)\"" --replace_string="command \"sysctl -e \1 || true\"" --target_file=$sysctl_file + + sysctl_file="/opt/gitlab/embedded/cookbooks/package/recipes/sysctl.rb" + ynh_replace_string --match_string="command \"sysctl -e \(.*\)\"" --replace_string="command \"sysctl -e \1 || true\"" --target_file=$sysctl_file } From 2b8349e486ef6e0a177bc56305754659e96f4968 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 22 Apr 2020 22:03:36 +0200 Subject: [PATCH 28/75] Update description --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 7beffa0..ef9a747 100644 --- a/manifest.json +++ b/manifest.json @@ -4,8 +4,8 @@ "packaging_format": 1, "version": "12.10.0~ynh1", "description": { - "en": "GitLab is a Git-repository manager.", - "fr": "GitLab est un gestionnaire de dépôts Git." + "en": "Git-repository manager.", + "fr": "Gestionnaire de dépôts Git." }, "url": "https://gitlab.com", "license": "MIT", From a0004a5f105fa9aba0f88c90bd6674222bb18f76 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 28 Apr 2020 19:52:21 +0200 Subject: [PATCH 29/75] 12.10.1 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1f4117d..a37597e 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.0 +**Shipped version:** 12.10.1 ## Screenshots diff --git a/manifest.json b/manifest.json index ef9a747..cc75e7c 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.10.0~ynh1", + "version": "12.10.1~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 69c40f5..7e20647 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,17 +1,17 @@ -gitlab_version="12.10.0" +gitlab_version="12.10.1" # sha256sum found here: https://packages.gitlab.com/gitlab if [ "$(lsb_release -sc)" = "buster" ] then - gitlab_x86_64_source_sha256="01d8d1dd2e4ed9a378317f55ab46174d6bd77e4eb1be32d87fe7911da8f65381" + gitlab_x86_64_source_sha256="4efd4599cecbcdbe4c03acabf8a678da7a1c0f3fe44270dc115128f87704a29c" else - gitlab_x86_64_source_sha256="ed24c9bd072b6f15f7c73367df04acba3e64ee53bb3562f25e768a2dda533ca2" + gitlab_x86_64_source_sha256="114e616b8fad94efcd7bcecd7b69d49c42384d6599ff49809c1951e3007afc9c" fi gitlab_x86_64_debian_verion="$(lsb_release -sc)" -gitlab_arm_source_sha256="5d4b1d76997de08e9707e5cb17445a38ed832bd9995f31a5af0b87134b7f0834" +gitlab_arm_source_sha256="cc52de7777e0a970be20bc3386144a2d2bb0e9aaaa8906e567a4ab0cd638288e" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From bbcee7b0caa573a73ed2f74d26d74389c4721516 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 30 Apr 2020 13:44:36 +0200 Subject: [PATCH 30/75] version --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- scripts/upgrade.d/upgrade.11.sh | 2 +- scripts/upgrade.d/upgrade.last.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index dafce4c..5d59fc5 100644 --- a/scripts/install +++ b/scripts/install @@ -178,7 +178,7 @@ ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitla if [ $architecture = "x86-64" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_x86_64_source_sha256" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_verion" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_version" --target_file="../conf/$architecture.src" elif [ $architecture = "arm" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_arm_source_sha256" --target_file="../conf/$architecture.src" fi diff --git a/scripts/restore b/scripts/restore index 0b6c49e..2e78b15 100644 --- a/scripts/restore +++ b/scripts/restore @@ -107,7 +107,7 @@ ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitla if [ $architecture = "x86-64" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_x86_64_source_sha256" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_verion" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_version" --target_file="../conf/$architecture.src" elif [ $architecture = "arm" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_arm_source_sha256" --target_file="../conf/$architecture.src" fi diff --git a/scripts/upgrade b/scripts/upgrade index b3a282b..968c480 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -267,7 +267,7 @@ then if [ $architecture = "x86-64" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_x86_64_source_sha256" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_verion" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_version" --target_file="../conf/$architecture.src" elif [ $architecture = "arm" ]; then ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_arm_source_sha256" --target_file="../conf/$architecture.src" fi diff --git a/scripts/upgrade.d/upgrade.11.sh b/scripts/upgrade.d/upgrade.11.sh index 69b1f93..237b9df 100644 --- a/scripts/upgrade.d/upgrade.11.sh +++ b/scripts/upgrade.d/upgrade.11.sh @@ -1,7 +1,7 @@ gitlab_version="11.11.5" # There is no buster version for gitlab 11.X -gitlab_x86_64_debian_verion="stretch" +gitlab_x86_64_debian_version="stretch" gitlab_x86_64_source_sha256="1ee3d6e8d2cc198f5466de0884c03f6016299db24859126af9a191501dbdef10" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 7e20647..cbe4d72 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -9,7 +9,7 @@ else gitlab_x86_64_source_sha256="114e616b8fad94efcd7bcecd7b69d49c42384d6599ff49809c1951e3007afc9c" fi -gitlab_x86_64_debian_verion="$(lsb_release -sc)" +gitlab_x86_64_debian_version="$(lsb_release -sc)" gitlab_arm_source_sha256="cc52de7777e0a970be20bc3386144a2d2bb0e9aaaa8906e567a4ab0cd638288e" From b94a18c170809671cad7b7f0c98aaed350eb8994 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 2 May 2020 01:44:36 +0200 Subject: [PATCH 31/75] Upgrade to 12.0.x before upgrading to a newer version --- scripts/upgrade | 5 ++--- scripts/upgrade.d/upgrade.11.sh | 3 ++- scripts/upgrade.d/upgrade.12.sh | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 scripts/upgrade.d/upgrade.12.sh diff --git a/scripts/upgrade b/scripts/upgrade index 968c480..8d8bc37 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -254,9 +254,8 @@ then current_major_version=$(($current_major_version + 1)) fi - # If the current version has the same major version than the next one, - # then it's the last upgrade to do - if [ "$last_major_version" -eq "$current_major_version" ]; then + # Finish with the last migration if the file doesn't exist + if [ ! -e "./upgrade.d/upgrade.$current_major_version.sh" ]; then current_major_version=last fi diff --git a/scripts/upgrade.d/upgrade.11.sh b/scripts/upgrade.d/upgrade.11.sh index 237b9df..b25d5f4 100644 --- a/scripts/upgrade.d/upgrade.11.sh +++ b/scripts/upgrade.d/upgrade.11.sh @@ -11,6 +11,7 @@ gitlab_filename="gitlab-ce-${gitlab_version}.deb" # Action to do in case of failure of the package_check package_check_action() { - ynh_replace_string --match_string="command \"cat \/etc\/sysctl.conf \/etc\/sysctl.d\/\*.conf | sysctl -e -p -\"" --replace_string="command \"cat \/etc\/sysctl.conf\"" --target_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb" + local sysctl_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb" + ynh_replace_string --match_string="command \"sysctl -e \(.*\)\"" --replace_string="command \"sysctl -e \1 || true\"" --target_file=$sysctl_file } diff --git a/scripts/upgrade.d/upgrade.12.sh b/scripts/upgrade.d/upgrade.12.sh new file mode 100644 index 0000000..f814a09 --- /dev/null +++ b/scripts/upgrade.d/upgrade.12.sh @@ -0,0 +1,18 @@ +# It's required to upgrade to the latest 12.0.x version before to another 12.X verion. +gitlab_version="12.0.12" + +# There is no buster version for gitlab 12.0.X +gitlab_x86_64_debian_version="stretch" + +gitlab_x86_64_source_sha256="e80cda4c328c2627278a3d74dbdd53420e1fec9ecbeaeb5d4dcb4773726e5904" + +gitlab_arm_source_sha256="a0862e3c31b61d9274a55b7307d15daa5258473ccb97b8ae0d807f7474c971df" + +gitlab_filename="gitlab-ce-${gitlab_version}.deb" + +# Action to do in case of failure of the package_check +package_check_action() { + local sysctl_file="$final_path/embedded/cookbooks/package/resources/sysctl.rb" + ynh_replace_string --match_string="command \"sysctl -e \(.*\)\"" --replace_string="command \"sysctl -e \1 || true\"" --target_file=$sysctl_file +} + From e540750330962d717457625633096341446339e0 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 2 May 2020 14:16:08 +0200 Subject: [PATCH 32/75] use ynh_check_ram --- manifest.json | 2 +- scripts/_common.sh | 71 ---------------------------------------------- scripts/install | 6 ++-- scripts/restore | 4 +-- scripts/upgrade | 4 +-- 5 files changed, 8 insertions(+), 79 deletions(-) diff --git a/manifest.json b/manifest.json index cc75e7c..7800c67 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 3.6.0" + "yunohost": ">= 3.8.1" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index a7ba0f4..b8cd1fc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -101,74 +101,3 @@ ynh_is_main_device_a_sd_card () { return 1 fi } - -# Check the amount of available RAM -# -# usage: ynh_check_ram [--required=RAM required in Mb] [--no_swap|--only_swap] [--free_ram] -# | arg: -r, --required= - Amount of RAM required in Mb. The helper will return 0 is there's enough RAM, or 1 otherwise. -# If --required isn't set, the helper will print the amount of RAM, in Mb. -# | arg: -s, --no_swap - Ignore swap -# | arg: -o, --only_swap - Ignore real RAM, consider only swap. -# | arg: -f, --free_ram - Count only free RAM, not the total amount of RAM available. -ynh_check_ram () { - # Declare an array to define the options of this helper. - declare -Ar args_array=( [r]=required= [s]=no_swap [o]=only_swap [f]=free_ram ) - local required - local no_swap - local only_swap - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - required=${required:-} - no_swap=${no_swap:-0} - only_swap=${only_swap:-0} - - local total_ram=$(vmstat --stats --unit M | grep "total memory" | awk '{print $1}') - local total_swap=$(vmstat --stats --unit M | grep "total swap" | awk '{print $1}') - local total_ram_swap=$(( total_ram + total_swap )) - - local free_ram=$(vmstat --stats --unit M | grep "free memory" | awk '{print $1}') - local free_swap=$(vmstat --stats --unit M | grep "free swap" | awk '{print $1}') - local free_ram_swap=$(( free_ram + free_swap )) - - # Use the total amount of ram - local ram=$total_ram_swap - if [ $free_ram -eq 1 ] - then - # Use the total amount of free ram - ram=$free_ram_swap - if [ $no_swap -eq 1 ] - then - # Use only the amount of free ram - ram=$free_ram - elif [ $only_swap -eq 1 ] - then - # Use only the amount of free swap - ram=$free_swap - fi - else - if [ $no_swap -eq 1 ] - then - # Use only the amount of free ram - ram=$total_ram - elif [ $only_swap -eq 1 ] - then - # Use only the amount of free swap - ram=$total_swap - fi - fi - - if [ -n "$required" ] - then - # Return 1 if the amount of ram isn't enough. - if [ $ram -lt $required ] - then - return 1 - else - return 0 - fi - - # If no RAM is required, return the amount of available ram. - else - echo $ram - fi -} diff --git a/scripts/install b/scripts/install index 5d59fc5..1c7908e 100644 --- a/scripts/install +++ b/scripts/install @@ -107,7 +107,7 @@ ynh_install_app_dependencies $pkg_dependencies unicorn_worker_processes=$(bc <<< "($(nproc) * 1.5 + 1) / 1") # If the server has at least 2GB of RAM -if [ $(ynh_check_ram --no_swap) -ge 2000 ]; then +if [ $(ynh_get_ram --total --ignore_swap) -ge 2000 ]; then # Min 3 worker processes unicorn_worker_processes=$(($unicorn_worker_processes>3?$unicorn_worker_processes:3)) else @@ -121,8 +121,8 @@ ynh_app_setting_set --app=$app --key=unicorn_worker_processes --value=$unicorn_w # ADD SWAP IF NEEDED #================================================= -total_memory=$(ynh_check_ram) -total_swap=$(ynh_check_ram --only_swap) +total_memory=$(ynh_get_ram --total) +total_swap=$(ynh_get_ram --total --only_swap) swap_needed=0 # https://docs.gitlab.com/ce/install/requirements.html#memory diff --git a/scripts/restore b/scripts/restore index 2e78b15..c688bde 100644 --- a/scripts/restore +++ b/scripts/restore @@ -67,8 +67,8 @@ ynh_install_app_dependencies $pkg_dependencies # ADD SWAP IF NEEDED #================================================= -total_memory=$(ynh_check_ram) -total_swap=$(ynh_check_ram --only_swap) +total_memory=$(ynh_get_ram --total) +total_swap=$(ynh_get_ram --total --only_swap) swap_needed=0 # https://docs.gitlab.com/ce/install/requirements.html#memory diff --git a/scripts/upgrade b/scripts/upgrade index 8d8bc37..1b9af7a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -181,8 +181,8 @@ ynh_install_app_dependencies $pkg_dependencies # ADD SWAP IF NEEDED #================================================= -total_memory=$(ynh_check_ram) -total_swap=$(ynh_check_ram --only_swap) +total_memory=$(ynh_get_ram --total) +total_swap=$(ynh_get_ram --total --only_swap) swap_needed=0 # https://docs.gitlab.com/ce/install/requirements.html#memory From 38ad738d716e097564d8a4f06ad9da21db1e2b63 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 6 May 2020 11:08:54 +0200 Subject: [PATCH 33/75] 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" From f41f3b2bb17c37b724aedf9380e6462d2e04ee66 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 12 May 2020 14:11:01 +0200 Subject: [PATCH 34/75] Fix upgrade --- check_process | 6 ++++++ manifest.json | 2 +- scripts/upgrade | 7 ++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index 45a2323..a42a051 100644 --- a/check_process +++ b/check_process @@ -16,6 +16,7 @@ setup_public=1 upgrade=1 upgrade=1 from_commit=2cc84310aeff7055342b445c1aee01d4183d5ae2 + upgrade=1 from_commit=7c352aff3fb13fc425d76716477c28db5d54ac99 backup_restore=1 multi_instance=0 port_already_use=1 (8080) @@ -25,3 +26,8 @@ ;;; Options Email= Notification=none +;;; Upgrade options + ; commit=2cc84310aeff7055342b445c1aee01d4183d5ae2 + name=Upgrade 11.6.3 + ; commit=7c352aff3fb13fc425d76716477c28db5d54ac99 + name=Upgrade 12.9.2 \ No newline at end of file diff --git a/manifest.json b/manifest.json index da6d722..ba01a3b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.10.3~ynh1", + "version": "12.10.3~ynh2", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." diff --git a/scripts/upgrade b/scripts/upgrade index 8d8bc37..502e13d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -241,7 +241,6 @@ then # Load the last available version source ./upgrade.d/upgrade.last.sh last_version=$gitlab_version - last_major_version=${gitlab_version%%.*} # While the current version is not the last version, do an upgrade while [ "$last_version" != "$current_version" ] @@ -249,8 +248,10 @@ then current_major_version=${current_version%%.*} - # If the current version is equal to the last minor version of upgrade.$current_major_version.sh, increment the major version - if [ "$gitlab_version" = "$current_version" ]; then + source ./upgrade.d/upgrade.$current_major_version.sh + + # f the current version is higher than the version stored in upgrade.$current_major_version.sh, increment the major version + if dpkg --compare-versions "$gitlab_version" "le" "$current_version"; then current_major_version=$(($current_major_version + 1)) fi From 64ed0b32f015d0cf9ff5a189422f2291ccaee503 Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 12 May 2020 17:16:46 +0200 Subject: [PATCH 35/75] Update check_process --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index a42a051..a4705b6 100644 --- a/check_process +++ b/check_process @@ -28,6 +28,6 @@ Email= Notification=none ;;; Upgrade options ; commit=2cc84310aeff7055342b445c1aee01d4183d5ae2 - name=Upgrade 11.6.3 + name=11.6.3 ; commit=7c352aff3fb13fc425d76716477c28db5d54ac99 - name=Upgrade 12.9.2 \ No newline at end of file + name=12.9.2 From 677037d02507dc519d1f6c538adce5200764df76 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 13 May 2020 10:14:20 +0200 Subject: [PATCH 36/75] improves comments --- scripts/upgrade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 502e13d..226be90 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -250,7 +250,8 @@ then source ./upgrade.d/upgrade.$current_major_version.sh - # f the current version is higher than the version stored in upgrade.$current_major_version.sh, increment the major version + # if the version stored in the upgrade.$current_major_version.sh file is less than or equal + # to the current version, increment the major version to upgrade to the next version if dpkg --compare-versions "$gitlab_version" "le" "$current_version"; then current_major_version=$(($current_major_version + 1)) fi From ea67cf647f815d890787cfa9c55fb72100efa1f4 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 23 May 2020 01:04:34 +0200 Subject: [PATCH 37/75] [WIP] 13.0.0 --- README.md | 2 +- conf/gitlab.rb | 161 ++++++++++++++++++++++----------------------- manifest.json | 6 +- scripts/_common.sh | 2 +- scripts/backup | 3 +- scripts/change_url | 17 +++-- scripts/install | 42 +++++++----- scripts/remove | 9 ++- scripts/restore | 9 ++- 9 files changed, 128 insertions(+), 123 deletions(-) diff --git a/README.md b/README.md index 3419ec6..56bdaee 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.3 +**Shipped version:** 13.0.0 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 129e484..520295e 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -48,7 +48,8 @@ external_url '__GENERATED_EXTERNAL_URL__' ## Roles for multi-instance GitLab ##! The default is to have no roles enabled, which results in GitLab running as an all-in-one instance. ##! Options: -##! redis_sentinel_role redis_master_role redis_slave_role geo_primary_role geo_secondary_role +##! redis_sentinel_role redis_master_role redis_replica_role geo_primary_role geo_secondary_role +##! postgres_role consul_role application_role monitoring_role ##! For more details on each role, see: ##! https://docs.gitlab.com/omnibus/roles/README.html#roles ##! @@ -238,6 +239,8 @@ 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" +####! Permanently remove messages from the mailbox when they are deleted after delivery +# gitlab_rails['incoming_email_expunge_deleted'] = false ####! The format of mail_room crash logs # mailroom['exit_log_format'] = "plain" @@ -557,13 +560,6 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # 'bantime' => 3600 # } -# Prioritize the Admin Area protected paths throttle settings over the -# deprecated Omnibus-managed protected paths throttle. This allows you to keep -# gitlab_rails['rack_attack_git_basic_auth'] enabled to run the Git and -# container registry failed authentication ban. -# See https://gitlab.com/gitlab-org/gitlab/issues/37093 -# gitlab_rails['rack_attack_admin_area_protected_paths_enabled'] = true - ###! **We do not recommend changing these directories.** # gitlab_rails['dir'] = "/var/opt/gitlab/gitlab-rails" # gitlab_rails['log_directory'] = "/var/log/gitlab/gitlab-rails" @@ -753,6 +749,12 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['sentry_clientside_dsn'] = 'https://@sentry.io/' # gitlab_rails['sentry_environment'] = 'production' +################################################################################ +## CI_JOB_JWT +################################################################################ +##! RSA private key used to sign CI_JOB_JWT +# gitlab_rails['ci_jwt_signing_key'] = nil # Will be generated if not set. + ################################################################################ ## GitLab Workhorse ##! Docs: https://gitlab.com/gitlab-org/gitlab-workhorse/blob/master/README.md @@ -825,15 +827,15 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ##! Docs: https://docs.gitlab.com/omnibus/settings/unicorn.html ################################################################################ -# unicorn['enable'] = true +unicorn['enable'] = false # unicorn['worker_timeout'] = 60 ###! Minimum worker_processes is 2 at this moment ###! See https://gitlab.com/gitlab-org/gitlab-foss/issues/18771 -unicorn['worker_processes'] = __UNICORN_WORKER_PROCESSES__ +# unicorn['worker_processes'] = 2 ### Advanced settings # unicorn['listen'] = 'localhost' -unicorn['port'] = __UNICORN_PORT__ +# unicorn['port'] = 8080 # unicorn['socket'] = '/var/opt/gitlab/gitlab-rails/sockets/gitlab.socket' # unicorn['pidfile'] = '/opt/gitlab/var/unicorn/unicorn.pid' # unicorn['tcp_nopush'] = true @@ -861,16 +863,16 @@ unicorn['port'] = __UNICORN_PORT__ ##! Docs: https://docs.gitlab.com/omnibus/settings/puma.html ################################################################################ -# puma['enable'] = false +puma['enable'] = true # puma['ha'] = false # puma['worker_timeout'] = 60 -# puma['worker_processes'] = 2 -# puma['min_threads'] = 4 -# puma['max_threads'] = 4 +puma['worker_processes'] = __PUMA_WORKER_PROCESSES__ +puma['min_threads'] = __PUMA_MIN_THREADS__ +puma['max_threads'] = __PUMA_MAX_THREADS__ ### Advanced settings # puma['listen'] = '127.0.0.1' -# puma['port'] = 8080 +puma['port'] = __PUMA_PORT__ # puma['socket'] = '/var/opt/gitlab/gitlab-rails/sockets/gitlab.socket' # puma['pidfile'] = '/opt/gitlab/var/puma/puma.pid' # puma['state_path'] = '/opt/gitlab/var/puma/puma.state' @@ -890,25 +892,35 @@ unicorn['port'] = __UNICORN_PORT__ ## GitLab Sidekiq ################################################################################ +##! GitLab allows one to start multiple sidekiq processes. These +##! processes can be used to consume a dedicated set of queues. This +##! can be used to ensure certain queues are able to handle additional workload. +##! https://docs.gitlab.com/ee/administration/operations/extra_sidekiq_processes.html + # sidekiq['log_directory'] = "/var/log/gitlab/sidekiq" # sidekiq['log_format'] = "json" # sidekiq['shutdown_timeout'] = 4 -# sidekiq['concurrency'] = 25 +# sidekiq['cluster'] = true +# sidekiq['experimental_queue_selector'] = false +# sidekiq['interval'] = nil +# sidekiq['max_concurrency'] = 50 +# sidekiq['min_concurrency'] = nil + +##! Each entry in the queue_groups array denotes a group of queues that have to be processed by a +##! Sidekiq process. Multiple queues can be processed by the same process by +##! separating them with a comma within the group entry, a `*` will process all queues + +# sidekiq['queue_groups'] = ['*'] + +##! If negate is enabled then sidekiq-cluster will process all the queues that +##! don't match those in queue_groups. + +# sidekiq['negate'] = false + # sidekiq['metrics_enabled'] = true # sidekiq['listen_address'] = "localhost" sidekiq['listen_port'] = __SIDEKIQ_PORT__ -### Experimental Sidekiq Cluster settings -###! These settings allow starting `sidekiq-cluster` instead of sidekiq. -###! Docs: https://docs.gitlab.com/ee/administration/operations/extra_sidekiq_processes.html#using-sidekiq-cluster-by-default-experimental -# sidekiq['cluster'] = false -# sidekiq['experimental_queue_selector'] = false -# sidekiq['interval'] = nil -# sidekiq['max_concurrency'] = nil -# sidekiq['min_concurrency'] = nil -# sidekiq['negate'] = false -# sidekiq['queue_groups'] = ['*'] - ################################################################################ ## gitlab-shell ################################################################################ @@ -985,7 +997,7 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # postgresql['hot_standby'] = "off" ### SSL settings -# See https://www.postgresql.org/docs/9.6/static/runtime-config-connection.html#GUC-SSL-CERT-FILE for more details +# See https://www.postgresql.org/docs/11/static/runtime-config-connection.html#GUC-SSL-CERT-FILE for more details # postgresql['ssl'] = 'on' # postgresql['ssl_ciphers'] = 'HIGH:MEDIUM:+3DES:!aNULL:!SSLv3:!TLSv1' # postgresql['ssl_cert_file'] = 'server.crt' @@ -1067,7 +1079,7 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # } # ] # } -# See https://www.postgresql.org/docs/9.6/static/auth-pg-hba-conf.html for an explanation +# See https://www.postgresql.org/docs/11/static/auth-pg-hba-conf.html for an explanation # of the values ### Version settings @@ -1108,11 +1120,11 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # ###! **To enable only Redis service in this machine, uncomment -###! one of the lines below (choose master or slave instance types).** +###! one of the lines below (choose master or replica instance types).** ###! Docs: https://docs.gitlab.com/omnibus/settings/redis.html ###! https://docs.gitlab.com/ee/administration/high_availability/redis.html # redis_master_role['enable'] = true -# redis_slave_role['enable'] = true +# redis_replica_role['enable'] = true ### Redis TCP support (will disable UNIX socket transport) # redis['bind'] = '0.0.0.0' # or specify an IP to bind to a single one @@ -1120,35 +1132,35 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # redis['password'] = 'redis-password-goes-here' ### Redis Sentinel support -###! **You need a master slave Redis replication to be able to do failover** +###! **You need a master replica Redis replication to be able to do failover** ###! **Please read the documentation before enabling it to understand the ###! caveats:** ###! Docs: https://docs.gitlab.com/ee/administration/high_availability/redis.html ### Replication support -#### Slave Redis instance +#### Replica Redis instance # redis['master'] = false # by default this is true -#### Slave and Sentinel shared configuration +#### Replica and Sentinel shared configuration ####! **Both need to point to the master Redis instance to get replication and ####! heartbeat monitoring** # redis['master_name'] = 'gitlab-redis' # redis['master_ip'] = nil # redis['master_port'] = 6379 -#### Support to run redis slaves in a Docker or NAT environment +#### Support to run redis replicas in a Docker or NAT environment ####! Docs: https://redis.io/topics/replication#configuring-replication-in-docker-and-nat # redis['announce_ip'] = nil # redis['announce_port'] = nil ####! **Master password should have the same value defined in ####! redis['password'] to enable the instance to transition to/from -####! master/slave in a failover event.** +####! master/replica in a failover event.** # redis['master_password'] = 'redis-password-goes-here' -####! Increase these values when your slaves can't catch up with master +####! Increase these values when your replicas can't catch up with master # redis['client_output_buffer_limit_normal'] = '0 0 0' -# redis['client_output_buffer_limit_slave'] = '256mb 64mb 60' +# redis['client_output_buffer_limit_replica'] = '256mb 64mb 60' # redis['client_output_buffer_limit_pubsub'] = '32mb 8mb 60' #####! Redis snapshotting frequency @@ -1266,7 +1278,7 @@ nginx['listen_https'] = false # nginx['log_directory'] = "/var/log/gitlab/nginx" # nginx['worker_processes'] = 4 # nginx['worker_connections'] = 10240 -# nginx['log_format'] = '$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"' +# nginx['log_format'] = '$remote_addr - $remote_user [$time_local] "$request_method $filtered_request_uri $server_protocol" $status $body_bytes_sent "$filtered_http_referer" "$http_user_agent" $gzip_ratio' # nginx['sendfile'] = 'on' # nginx['tcp_nopush'] = 'on' # nginx['tcp_nodelay'] = 'on' @@ -1274,7 +1286,7 @@ nginx['listen_https'] = false # nginx['gzip_http_version'] = "1.0" # nginx['gzip_comp_level'] = "2" # nginx['gzip_proxied'] = "any" -# nginx['gzip_types'] = [ "text/plain", "text/css", "application/x-javascript", "text/xml", "application/xml", "application/xml+rss", "text/javascript", "application/json" ] +# nginx['gzip_types'] = [ "text/html", "text/plain", "text/css", "application/x-javascript", "text/xml", "application/xml", "application/xml+rss", "text/javascript", "application/json" ] # nginx['keepalive_timeout'] = 65 # nginx['cache_max_size'] = '5000m' # nginx['server_names_hash_bucket_size'] = 64 @@ -1456,6 +1468,7 @@ nginx['listen_https'] = false # gitlab_pages['gitlab_secret'] = nil # Generated if not present # gitlab_pages['auth_redirect_uri'] = nil # Defaults to projects subdomain of pages_external_url and + '/auth' # gitlab_pages['gitlab_server'] = nil # Defaults to external_url +# gitlab_pages['internal_gitlab_server'] = nil # defaults to gitlab_server, can be changed to internal load balancer # gitlab_pages['auth_secret'] = nil # Generated if not present ##! GitLab API HTTP client connection timeout @@ -1788,6 +1801,7 @@ nginx['listen_https'] = false # grafana['metrics_enabled'] = false # grafana['metrics_basic_auth_username'] = 'grafana_metrics' # default: nil # grafana['metrics_basic_auth_password'] = 'please_set_a_unique_password' # default: nil +# grafana['alerting_enabled'] = false ### Dashboards # @@ -1842,7 +1856,12 @@ nginx['listen_https'] = false # gitaly['env_directory'] = "/opt/gitlab/etc/gitaly/env" # gitaly['env'] = { # 'PATH' => "/opt/gitlab/bin:/opt/gitlab/embedded/bin:/bin:/usr/bin", -# 'HOME' => '/var/opt/gitlab' +# 'HOME' => '/var/opt/gitlab', +# 'TZ' => ':/etc/localtime', +# 'PYTHONPATH' => "/opt/gitlab/embedded/lib/python3.7/site-packages", +# 'ICU_DATA' => "/opt/gitlab/embedded/share/icu/current", +# 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/", +# 'WRAPPER_JSON_LOGGING' => true # } ##! internal_socket_dir is the directory that will contain internal gitaly sockets, @@ -1887,6 +1906,15 @@ nginx['listen_https'] = false ################################################################################ # praefect['enable'] = false +# praefect['dir'] = "/var/opt/gitlab/praefect" +# praefect['log_directory'] = "/var/log/gitlab/praefect" +# praefect['env_directory'] = "/opt/gitlab/etc/praefect/env" +# praefect['env'] = { +# 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/", +# 'GITALY_PID_FILE' => "/var/opt/gitlab/praefect/praefect.pid", +# 'WRAPPER_JSON_LOGGING' => true +# } +# praefect['wrapper_path'] = "/opt/gitlab/embedded/bin/gitaly-wrapper" # praefect['virtual_storage_name'] = "praefect" # praefect['failover_enabled'] = false # praefect['failover_election_strategy'] = 'local' @@ -2104,52 +2132,21 @@ nginx['listen_https'] = false ##! already tried against the same master by a given Sentinel, is two ##! times the failover timeout. ##! -##! - The time needed for a slave replicating to a wrong master according +##! - The time needed for a replica replicating to a wrong master according ##! to a Sentinel current configuration, to be forced to replicate ##! with the right master, is exactly the failover timeout (counting since ##! the moment a Sentinel detected the misconfiguration). ##! ##! - The time needed to cancel a failover that is already in progress but -##! did not produced any configuration change (SLAVEOF NO ONE yet not -##! acknowledged by the promoted slave). +##! did not produced any configuration change (REPLICAOF NO ONE yet not +##! acknowledged by the promoted replica). ##! -##! - The maximum time a failover in progress waits for all the slaves to be -##! reconfigured as slaves of the new master. However even after this time -##! the slaves will be reconfigured by the Sentinels anyway, but not with +##! - The maximum time a failover in progress waits for all the replicas to be +##! reconfigured as replicas of the new master. However even after this time +##! the replicas will be reconfigured by the Sentinels anyway, but not with ##! the exact parallel-syncs progression as specified. # sentinel['failover_timeout'] = 60000 -################################################################################ -## GitLab Sidekiq Cluster (EE only) -################################################################################ - -##! GitLab Enterprise Edition allows one to start an extra set of Sidekiq processes -##! besides the default one. These processes can be used to consume a dedicated set -##! of queues. This can be used to ensure certain queues always have dedicated -##! workers, no matter the amount of jobs that need to be processed. - -# sidekiq_cluster['enable'] = false -# sidekiq_cluster['ha'] = false -# sidekiq_cluster['log_directory'] = "/var/log/gitlab/sidekiq-cluster" -# sidekiq_cluster['interval'] = 5 # The number of seconds to wait between worker checks -# sidekiq_cluster['max_concurrency'] = 50 # The maximum number of threads each Sidekiq process should run -# sidekiq_cluster['min_concurrency'] = 0 # The minimum number of threads each Sidekiq process should run - -##! Each entry in the queue_groups array denotes a group of queues that have to be processed by a -##! Sidekiq process. Multiple queues can be processed by the same process by -##! separating them with a comma within the group entry - -# sidekiq_cluster['queue_groups'] = [ -# "process_commit,post_receive", -# "gitlab_shell" -# ] -# - -##! If negate is enabled then sidekiq-cluster will process all the queues that -##! don't match those in queue_groups. - -# sidekiq_cluster['negate'] = false - ################################################################################ ## Additional Database Settings (EE only) ##! Docs: https://docs.gitlab.com/ee/administration/database_load_balancing.html @@ -2161,7 +2158,7 @@ nginx['listen_https'] = false ##! Docs: https://docs.gitlab.com/ee/gitlab-geo ################################################################################ ##! 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. +##! 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 @@ -2209,7 +2206,9 @@ nginx['listen_https'] = false ################################################################################ ## Unleash -##! Docs: https://docs.gitlab.com/ee/user/project/operations/feature_flags.html +##! These settings are for GitLab internal use. +##! They are used to control feature flags during GitLab development. +##! Docs: https://docs.gitlab.com/ee/development/feature_flags ################################################################################ # gitlab_rails['feature_flags_unleash_enabled'] = false # gitlab_rails['feature_flags_unleash_url'] = nil diff --git a/manifest.json b/manifest.json index ba01a3b..20feff5 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.10.3~ynh2", + "version": "13.0.0~ynh1", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." @@ -38,8 +38,8 @@ "en": "Choose a path for gitlab", "fr": "Choisissez un chemin pour gitlab" }, - "example": "/", - "default": "/" + "example": "/gitlab", + "default": "/gitlab" }, { "name": "admin", diff --git a/scripts/_common.sh b/scripts/_common.sh index a7ba0f4..3bf74f9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # SET ALL CONSTANTS #================================================= -pkg_dependencies="openssh-server bc" +pkg_dependencies="openssh-server" #================================================= # EXPERIMENTAL HELPERS diff --git a/scripts/backup b/scripts/backup index 895d95e..32523cb 100644 --- a/scripts/backup +++ b/scripts/backup @@ -28,7 +28,6 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get --app=$app --key=final_path) config_path=$(ynh_app_setting_get --app=$app --key=config_path) domain=$(ynh_app_setting_get --app=$app --key=domain) @@ -46,7 +45,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= ynh_script_progression --message="Backuping of Gitlab..." --weight=9 -# Use gitlab-rake to backup +# Use gitlab-backup to backup # For the complete doc: https://docs.gitlab.com/ce/raketasks/backup_restore.html # For the filename: https://docs.gitlab.com/ce/raketasks/backup_restore.html#backup-filename gitlab-backup create BACKUP=last diff --git a/scripts/change_url b/scripts/change_url index b30f1e3..80c4f41 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -27,12 +27,13 @@ app=$YNH_APP_INSTANCE_NAME ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) config_path=$(ynh_app_setting_get --app=$app --key=config_path) port=$(ynh_app_setting_get --app="$app" --key=web_port) -portUnicorn=$(ynh_app_setting_get --app="$app" --key=unicorn_port) +portPuma=$(ynh_app_setting_get --app="$app" --key=puma_port) portSidekiq=$(ynh_app_setting_get --app="$app" --key=sidekiq_port) -unicorn_worker_processes=$(ynh_app_setting_get --app="$app" --key=unicorn_worker_processes) +puma_worker_processes=$(ynh_app_setting_get --app="$app" --key=puma_worker_processes) +puma_min_threads=$(ynh_app_setting_get --app="$app" --key=puma_min_threads) +puma_max_threads=$(ynh_app_setting_get --app="$app" --key=puma_max_threads) client_max_body_size=$(ynh_app_setting_get --app="$app" --key=client_max_body_size) #================================================= @@ -63,7 +64,7 @@ if [ $change_path -eq 1 ]; then #doc in: https://docs.gitlab.com/omnibus/settings/configuration.html#configuring-the-external-url-for-gitlab - gitlab-ctl stop unicorn + gitlab-ctl stop puma gitlab-ctl stop sidekiq # Make a backup of the original nginx config file if modified @@ -105,8 +106,10 @@ path_url="$new_path" ynh_replace_string --match_string="__GENERATED_EXTERNAL_URL__" --replace_string="https://$domain${path_url%/}" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__UNICORN_PORT__" --replace_string="$portUnicorn" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__UNICORN_WORKER_PROCESSES__" --replace_string="$unicorn_worker_processes" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_PORT__" --replace_string="$portPuma" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_WORKER_PROCESSES__" --replace_string="$puma_worker_processes" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_MIN_THREADS__" --replace_string="$puma_min_threads" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_MAX_THREADS__" --replace_string="$puma_max_threads" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__CLIENT_MAX_BODY_SIZE__" --replace_string="$client_max_body_size" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__SSH_PORT__" --replace_string="$ssh_port" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__SIDEKIQ_PORT__" --replace_string="$portSidekiq" --target_file="$config_path/gitlab.rb" @@ -124,7 +127,7 @@ gitlab-ctl reconfigure #================================================= ynh_script_progression --message="Waiting for gitlab..." --weight=15 -ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300 +ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on tcp://127.0.0.1:$portPuma" --timeout=300 #================================================= # GENERIC FINALISATION diff --git a/scripts/install b/scripts/install index 5d59fc5..ae14bb8 100644 --- a/scripts/install +++ b/scripts/install @@ -85,11 +85,11 @@ ynh_script_progression --message="Find internal port..." --weight=1 # Find free ports port=$(ynh_find_port --port=8080) -portUnicorn=$(ynh_find_port --port=$(($port + 1))) -portSidekiq=$(ynh_find_port --port=$(($portUnicorn + 1))) +portPuma=$(ynh_find_port --port=$(($port + 1))) +portSidekiq=$(ynh_find_port --port=$(($portPuma + 1))) ynh_app_setting_set --app=$app --key=web_port --value=$port -ynh_app_setting_set --app=$app --key=unicorn_port --value=$portUnicorn +ynh_app_setting_set --app=$app --key=puma_port --value=$portPuma ynh_app_setting_set --app=$app --key=sidekiq_port --value=$portSidekiq #================================================= @@ -103,19 +103,21 @@ ynh_install_app_dependencies $pkg_dependencies # DEFINE THE NUMBER OF WORKERS USED #================================================= -# https://docs.gitlab.com/ce/install/requirements.html#unicorn-workers -unicorn_worker_processes=$(bc <<< "($(nproc) * 1.5 + 1) / 1") +#https://docs.gitlab.com/ce/install/requirements.html#puma-workers +puma_worker_processes=$(( $(nproc) > 2 ? $(nproc) : 2 )) -# If the server has at least 2GB of RAM -if [ $(ynh_check_ram --no_swap) -ge 2000 ]; then - # Min 3 worker processes - unicorn_worker_processes=$(($unicorn_worker_processes>3?$unicorn_worker_processes:3)) +# If the server has less than 2GB of RAM +if [ $(ynh_check_ram --no_swap) -lt 2000 ]; then + puma_min_threads=1 + puma_max_threads=1 else - # 2 worker processes - unicorn_worker_processes=2 + puma_min_threads=2 + puma_max_threads=4 fi -ynh_app_setting_set --app=$app --key=unicorn_worker_processes --value=$unicorn_worker_processes +ynh_app_setting_set --app=$app --key=puma_workers --value=$puma_worker_processes +ynh_app_setting_set --app=$app --key=puma_max_threads --value=$puma_max_threads +ynh_app_setting_set --app=$app --key=puma_min_threads --value=$puma_min_threads #================================================= # ADD SWAP IF NEEDED @@ -136,8 +138,10 @@ if [ $(($total_swap + $swap_needed)) -lt 2048 ]; then swap_needed=$((2048 - $total_swap)) fi -ynh_script_progression --message="Adding $swap_needed Mo to swap..." --weight=1 -ynh_add_swap --size=$swap_needed +if [ $swap_needed -gt 0 ]; then + ynh_script_progression --message="Adding $swap_needed Mo to swap..." + ynh_add_swap --size=$swap_needed +fi #================================================= # PRECONFIGURE GITLAB @@ -154,8 +158,10 @@ ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+") ynh_replace_string --match_string="__GENERATED_EXTERNAL_URL__" --replace_string="https://$domain${path_url%/}" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__UNICORN_PORT__" --replace_string="$portUnicorn" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__UNICORN_WORKER_PROCESSES__" --replace_string="$unicorn_worker_processes" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_PORT__" --replace_string="$portPuma" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_WORKER_PROCESSES__" --replace_string="$puma_worker_processes" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_MIN_THREADS__" --replace_string="$puma_min_threads" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_MAX_THREADS__" --replace_string="$puma_max_threads" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__CLIENT_MAX_BODY_SIZE__" --replace_string="$client_max_body_size" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__SSH_PORT__" --replace_string="$ssh_port" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__SIDEKIQ_PORT__" --replace_string="$portSidekiq" --target_file="$config_path/gitlab.rb" @@ -231,7 +237,7 @@ gitlab-ctl reconfigure # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/application.log" "/var/log/$app/gitlab-rails/api_json.log" "/var/log/$app/gitlab-rails/production.log" "/var/log/$app/gitlab-rails/production_json.log" "/var/log/$app/gitlab-rails/sidekiq.log" "/var/log/$app/unicorn/unicorn_stderr.log" "/var/log/$app/unicorn/current" "/var/log/$app/alertmanager/current" "/var/log/$app/gitaly/current" "/var/log/$app/gitlab-monitor/current" "/var/log/$app/gitlab-shell/gitlab-shell.log" "/var/log/$app/gitlab-workhorse/current" "/var/log/$app/logrotate/current" "/var/log/$app/nginx/current" "/var/log/$app/nginx/access.log" "/var/log/$app/nginx/error.log" "/var/log/$app/nginx/gitlab_access.log" "/var/log/$app/nginx/gitlab_error.log" "/var/log/$app/node-exporter/current" "/var/log/$app/postgres-exporter/current" "/var/log/$app/postgresql/current" "/var/log/$app/prometheus/current" "/var/log/$app/redis/current" "/var/log/$app/redis-exporter/current" +yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/application.log" "/var/log/$app/gitlab-rails/api_json.log" "/var/log/$app/gitlab-rails/production.log" "/var/log/$app/gitlab-rails/production_json.log" "/var/log/$app/gitlab-rails/sidekiq.log" "/var/log/$app/puma/puma_stderr.log" "/var/log/$app/puma/current" "/var/log/$app/alertmanager/current" "/var/log/$app/gitaly/current" "/var/log/$app/gitlab-monitor/current" "/var/log/$app/gitlab-shell/gitlab-shell.log" "/var/log/$app/gitlab-workhorse/current" "/var/log/$app/logrotate/current" "/var/log/$app/nginx/current" "/var/log/$app/nginx/access.log" "/var/log/$app/nginx/error.log" "/var/log/$app/nginx/gitlab_access.log" "/var/log/$app/nginx/gitlab_error.log" "/var/log/$app/node-exporter/current" "/var/log/$app/postgres-exporter/current" "/var/log/$app/postgresql/current" "/var/log/$app/prometheus/current" "/var/log/$app/redis/current" "/var/log/$app/redis-exporter/current" #================================================= # SETUP SSOWAT @@ -256,7 +262,7 @@ ynh_systemd_action --action=reload --service_name=nginx #================================================= ynh_script_progression --message="Restarting gitlab..." --weight=15 -ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300 +ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on tcp://127.0.0.1:$portPuma" --timeout=300 #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index c79bc79..c2c8ba3 100644 --- a/scripts/remove +++ b/scripts/remove @@ -16,9 +16,8 @@ ynh_script_progression --message="Loading installation settings..." --weight=2 app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app="$app" --key=domain) port=$(ynh_app_setting_get --app="$app" --key=web_port) -portUnicorn=$(ynh_app_setting_get --app="$app" --key=unicorn_port) +portPuma=$(ynh_app_setting_get --app="$app" --key=puma_port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) config_path=$(ynh_app_setting_get --app=$app --key=config_path) @@ -84,9 +83,9 @@ if yunohost firewall list | grep -q "\- $port$"; then ynh_exec_warn_less yunohost firewall disallow TCP $port fi -if yunohost firewall list | grep -q "\- $portUnicorn$"; then - ynh_script_progression --message="Closing port $portUnicorn" --weight=1 - ynh_exec_warn_less yunohost firewall disallow TCP $portUnicorn +if yunohost firewall list | grep -q "\- $portPuma$"; then + ynh_script_progression --message="Closing port $portPuma" --weight=1 + ynh_exec_warn_less yunohost firewall disallow TCP $portPuma fi #================================================= diff --git a/scripts/restore b/scripts/restore index 2e78b15..adc9e3b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -33,8 +33,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) config_path=$(ynh_app_setting_get --app=$app --key=config_path) -port=$(ynh_app_setting_get --app="$app" --key=web_port) -portUnicorn=$(ynh_app_setting_get --app="$app" --key=unicorn_port) +portPuma=$(ynh_app_setting_get --app="$app" --key=puma_port) architecture=$(ynh_app_setting_get --app="$app" --key=architecture) #================================================= @@ -133,7 +132,7 @@ ynh_restore_file --origin_path="/var/opt/$app/backups/last_gitlab_backup.tar" last_backup="last" -gitlab-ctl stop unicorn +gitlab-ctl stop puma gitlab-ctl stop sidekiq # Use gitlab-rake to backup @@ -151,14 +150,14 @@ fi # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/application.log" "/var/log/$app/gitlab-rails/api_json.log" "/var/log/$app/gitlab-rails/production.log" "/var/log/$app/gitlab-rails/production_json.log" "/var/log/$app/gitlab-rails/sidekiq.log" "/var/log/$app/unicorn/unicorn_stderr.log" "/var/log/$app/unicorn/current" "/var/log/$app/alertmanager/current" "/var/log/$app/gitaly/current" "/var/log/$app/gitlab-monitor/current" "/var/log/$app/gitlab-shell/gitlab-shell.log" "/var/log/$app/gitlab-workhorse/current" "/var/log/$app/logrotate/current" "/var/log/$app/nginx/current" "/var/log/$app/nginx/access.log" "/var/log/$app/nginx/error.log" "/var/log/$app/nginx/gitlab_access.log" "/var/log/$app/nginx/gitlab_error.log" "/var/log/$app/node-exporter/current" "/var/log/$app/postgres-exporter/current" "/var/log/$app/postgresql/current" "/var/log/$app/prometheus/current" "/var/log/$app/redis/current" "/var/log/$app/redis-exporter/current" +yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/application.log" "/var/log/$app/gitlab-rails/api_json.log" "/var/log/$app/gitlab-rails/production.log" "/var/log/$app/gitlab-rails/production_json.log" "/var/log/$app/gitlab-rails/sidekiq.log" "/var/log/$app/puma/puma_stderr.log" "/var/log/$app/puma/current" "/var/log/$app/alertmanager/current" "/var/log/$app/gitaly/current" "/var/log/$app/gitlab-monitor/current" "/var/log/$app/gitlab-shell/gitlab-shell.log" "/var/log/$app/gitlab-workhorse/current" "/var/log/$app/logrotate/current" "/var/log/$app/nginx/current" "/var/log/$app/nginx/access.log" "/var/log/$app/nginx/error.log" "/var/log/$app/nginx/gitlab_access.log" "/var/log/$app/nginx/gitlab_error.log" "/var/log/$app/node-exporter/current" "/var/log/$app/postgres-exporter/current" "/var/log/$app/postgresql/current" "/var/log/$app/prometheus/current" "/var/log/$app/redis/current" "/var/log/$app/redis-exporter/current" #================================================= # WAITING GITLAB #================================================= ynh_script_progression --message="Waiting for gitlab..." --weight=14 -ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300 +ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on tcp://127.0.0.1:$portPuma" --timeout=300 #================================================= # CHECK THE RESTORED DATA From 21c6f76ef2a815796d784b8cf0cafbb125f981ae Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 23 May 2020 02:07:01 +0200 Subject: [PATCH 38/75] Upgrade to 13.0.0 --- scripts/upgrade | 90 ++++++++++++------- .../{upgrade.11.sh => upgrade.11.last.sh} | 0 .../{upgrade.12.sh => upgrade.12.first.sh} | 0 scripts/upgrade.d/upgrade.12.last.sh | 25 ++++++ scripts/upgrade.d/upgrade.last.sh | 8 +- 5 files changed, 87 insertions(+), 36 deletions(-) rename scripts/upgrade.d/{upgrade.11.sh => upgrade.11.last.sh} (100%) rename scripts/upgrade.d/{upgrade.12.sh => upgrade.12.first.sh} (100%) create mode 100644 scripts/upgrade.d/upgrade.12.last.sh diff --git a/scripts/upgrade b/scripts/upgrade index 226be90..c702141 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,15 +18,16 @@ app=$YNH_APP_INSTANCE_NAME # Retrieve app settings domain=$(ynh_app_setting_get --app="$app" --key=domain) path_url=$(ynh_app_setting_get --app="$app" --key=path) -admin=$(ynh_app_setting_get --app="$app" --key=admin) is_public=$(ynh_app_setting_get --app="$app" --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) config_path=$(ynh_app_setting_get --app=$app --key=config_path) port=$(ynh_app_setting_get --app="$app" --key=web_port) -portUnicorn=$(ynh_app_setting_get --app="$app" --key=unicorn_port) +portPuma=$(ynh_app_setting_get --app="$app" --key=puma_port) portSidekiq=$(ynh_app_setting_get --app="$app" --key=sidekiq_port) architecture=$(ynh_app_setting_get --app="$app" --key=architecture) -unicorn_worker_processes=$(ynh_app_setting_get --app="$app" --key=unicorn_worker_processes) +puma_worker_processes=$(ynh_app_setting_get --app="$app" --key=puma_worker_processes) +puma_min_threads=$(ynh_app_setting_get --app="$app" --key=puma_min_threads) +puma_max_threads=$(ynh_app_setting_get --app="$app" --key=puma_max_threads) client_max_body_size=$(ynh_app_setting_get --app="$app" --key=client_max_body_size) overwrite_nginx=$(ynh_app_setting_get --app="$app" --key=overwrite_nginx) @@ -61,25 +62,24 @@ if [ -z "$config_path" ]; then ynh_app_setting_set --app=$app --key=config_path --value=$config_path fi -if [ -z "$unicorn_worker_processes" ]; then - # https://docs.gitlab.com/ce/install/requirements.html#unicorn-workers - unicorn_worker_processes=$(($(nproc) + 1 )) +if [ -z "$puma_worker_processes" ]; then + #https://docs.gitlab.com/ce/install/requirements.html#puma-workers + puma_worker_processes=$(( $(nproc) > 2 ? $(nproc) : 2 )) - # If the server has at least 2GB of RAM - if [ $(free -g --si | grep Mem: | awk '{print $2}') -ge 2 ]; then - # Min 3 worker processes - unicorn_worker_processes=$(($unicorn_worker_processes>3?$unicorn_worker_processes:3)) + # If the server has less than 2GB of RAM + if [ $(ynh_check_ram --no_swap) -lt 2000 ]; then + puma_min_threads=1 + puma_max_threads=1 else - # 2 worker processes - unicorn_worker_processes=2 + puma_min_threads=2 + puma_max_threads=4 fi - ynh_app_setting_set --app=$app --key=unicorn_worker_processes --value=$unicorn_worker_processes -fi -if [ -z "$portSidekiq" ]; then - portSidekiq=$(ynh_find_port $(($portUnicorn + 1))) - - ynh_app_setting_set --app=$app --key=sidekiq_port --value=$portSidekiq + ynh_app_setting_set --app=$app --key=puma_workers --value=$puma_worker_processes + ynh_app_setting_set --app=$app --key=puma_max_threads --value=$puma_max_threads + ynh_app_setting_set --app=$app --key=puma_min_threads --value=$puma_min_threads + + ynh_app_setting_delete --app=$app --key=unicorn_worker_processes fi # If architecture doesn't exist, create it @@ -133,9 +133,17 @@ if [ -z "$port" ]; then fi # If port doesn't exist, retrieve it -if [ -z "$portUnicorn" ]; then - portUnicorn=$(grep -F "unicorn['port']" "/etc/gitlab/gitlab.rb" | cut -d' ' -f3) - ynh_app_setting_set --app=$app --key=unicorn_port --value=$portUnicorn +if [ -z "$portPuma" ]; then + if [ -z "$(ynh_app_setting_get --app="$app" --key=unicorn_port)" ]; then + portPuma=$(grep -F "unicorn['port']" "/etc/gitlab/gitlab.rb" | cut -d' ' -f3) + fi + ynh_app_setting_set --app=$app --key=puma_port --value=$portPuma + ynh_app_setting_delete --app=$app --key=unicorn_port +fi + +if [ -z "$portSidekiq" ]; then + portSidekiq=$(ynh_find_port $(($portPuma + 1))) + ynh_app_setting_set --app=$app --key=sidekiq_port --value=$portSidekiq fi # if this source file exist, remove it @@ -214,8 +222,10 @@ ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+") ynh_replace_string --match_string="__GENERATED_EXTERNAL_URL__" --replace_string="https://$domain${path_url%/}" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__UNICORN_PORT__" --replace_string="$portUnicorn" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__UNICORN_WORKER_PROCESSES__" --replace_string="$unicorn_worker_processes" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_PORT__" --replace_string="$portPuma" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_WORKER_PROCESSES__" --replace_string="$puma_worker_processes" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_MIN_THREADS__" --replace_string="$puma_min_threads" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_MAX_THREADS__" --replace_string="$puma_max_threads" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__CLIENT_MAX_BODY_SIZE__" --replace_string="$client_max_body_size" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__SSH_PORT__" --replace_string="$ssh_port" --target_file="$config_path/gitlab.rb" ynh_replace_string --match_string="__SIDEKIQ_PORT__" --replace_string="$portSidekiq" --target_file="$config_path/gitlab.rb" @@ -242,26 +252,42 @@ then source ./upgrade.d/upgrade.last.sh last_version=$gitlab_version + # To update gitlab from major version A to B, we have to go to the last minor version + # of the major version A and then go to the first minor version of the major version B + # to finally go to the current minor version of the major version B + # A.last -> B.first -> B.last + # While the current version is not the last version, do an upgrade while [ "$last_version" != "$current_version" ] do current_major_version=${current_version%%.*} - source ./upgrade.d/upgrade.$current_major_version.sh + if [ -e "./upgrade.d/upgrade.$current_major_version.first.sh" ]; then + source ./upgrade.d/upgrade.$current_major_version.first.sh + elif [ -e "./upgrade.d/upgrade.$current_major_version.last.sh" ]; then + source ./upgrade.d/upgrade.$current_major_version.last.sh + fi - # if the version stored in the upgrade.$current_major_version.sh file is less than or equal - # to the current version, increment the major version to upgrade to the next version + # if the version stored in the upgrade.$current_major_version.first.sh file is less than or equal + # to the current version, and if the version stored in the upgrade.$current_major_version.last.sh file + # increment the major version to upgrade to the next version if dpkg --compare-versions "$gitlab_version" "le" "$current_version"; then - current_major_version=$(($current_major_version + 1)) + if [ -e "./upgrade.d/upgrade.$current_major_version.last.sh" ]; then + source ./upgrade.d/upgrade.$current_major_version.last.sh + else + source ./upgrade.d/upgrade.last.sh + fi + if dpkg --compare-versions "$gitlab_version" "le" "$current_version"; then + current_major_version=$(($current_major_version + 1)) + fi fi # Finish with the last migration if the file doesn't exist - if [ ! -e "./upgrade.d/upgrade.$current_major_version.sh" ]; then - current_major_version=last + if [ ! -e "./upgrade.d/upgrade.$current_major_version.first.sh" ] && [ ! -e "./upgrade.d/upgrade.$current_major_version.last.sh" ]; then + source ./upgrade.d/upgrade.last.sh fi - source ./upgrade.d/upgrade.$current_major_version.sh cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" @@ -307,7 +333,7 @@ fi # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/application.log" "/var/log/$app/gitlab-rails/api_json.log" "/var/log/$app/gitlab-rails/production.log" "/var/log/$app/gitlab-rails/production_json.log" "/var/log/$app/gitlab-rails/sidekiq.log" "/var/log/$app/unicorn/unicorn_stderr.log" "/var/log/$app/unicorn/current" "/var/log/$app/alertmanager/current" "/var/log/$app/gitaly/current" "/var/log/$app/gitlab-monitor/current" "/var/log/$app/gitlab-shell/gitlab-shell.log" "/var/log/$app/gitlab-workhorse/current" "/var/log/$app/logrotate/current" "/var/log/$app/nginx/current" "/var/log/$app/nginx/access.log" "/var/log/$app/nginx/error.log" "/var/log/$app/nginx/gitlab_access.log" "/var/log/$app/nginx/gitlab_error.log" "/var/log/$app/node-exporter/current" "/var/log/$app/postgres-exporter/current" "/var/log/$app/postgresql/current" "/var/log/$app/prometheus/current" "/var/log/$app/redis/current" "/var/log/$app/redis-exporter/current" +yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/application.log" "/var/log/$app/gitlab-rails/api_json.log" "/var/log/$app/gitlab-rails/production.log" "/var/log/$app/gitlab-rails/production_json.log" "/var/log/$app/gitlab-rails/sidekiq.log" "/var/log/$app/puma/puma_stderr.log" "/var/log/$app/puma/current" "/var/log/$app/alertmanager/current" "/var/log/$app/gitaly/current" "/var/log/$app/gitlab-monitor/current" "/var/log/$app/gitlab-shell/gitlab-shell.log" "/var/log/$app/gitlab-workhorse/current" "/var/log/$app/logrotate/current" "/var/log/$app/nginx/current" "/var/log/$app/nginx/access.log" "/var/log/$app/nginx/error.log" "/var/log/$app/nginx/gitlab_access.log" "/var/log/$app/nginx/gitlab_error.log" "/var/log/$app/node-exporter/current" "/var/log/$app/postgres-exporter/current" "/var/log/$app/postgresql/current" "/var/log/$app/prometheus/current" "/var/log/$app/redis/current" "/var/log/$app/redis-exporter/current" #================================================= # SETUP SSOWAT @@ -327,7 +353,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Restarting gitlab..." --weight=15 - ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=300 + ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on tcp://127.0.0.1:$portPuma" --timeout=300 fi #================================================= diff --git a/scripts/upgrade.d/upgrade.11.sh b/scripts/upgrade.d/upgrade.11.last.sh similarity index 100% rename from scripts/upgrade.d/upgrade.11.sh rename to scripts/upgrade.d/upgrade.11.last.sh diff --git a/scripts/upgrade.d/upgrade.12.sh b/scripts/upgrade.d/upgrade.12.first.sh similarity index 100% rename from scripts/upgrade.d/upgrade.12.sh rename to scripts/upgrade.d/upgrade.12.first.sh diff --git a/scripts/upgrade.d/upgrade.12.last.sh b/scripts/upgrade.d/upgrade.12.last.sh new file mode 100644 index 0000000..f0eca8a --- /dev/null +++ b/scripts/upgrade.d/upgrade.12.last.sh @@ -0,0 +1,25 @@ +gitlab_version="12.10.6" + +# sha256sum found here: https://packages.gitlab.com/gitlab + +gitlab_x86_64_debian_version="$(lsb_release -sc)" + +if [ "$gitlab_x86_64_debian_version" = "buster" ] +then + gitlab_x86_64_source_sha256="8305869246a70fb033fda3ba533f7b3459e7a044c0777dbc0215d868d73a22e6" +else + gitlab_x86_64_source_sha256="f7c5a76bbb3cd192328be09832cce81d85847f22e97677c46087d5d1b8234cba" +fi + +gitlab_arm_source_sha256="2e44c2c96cb6f381565f68814657b2ac73f11609601d16d4de6c539a53bb358f" + +gitlab_filename="gitlab-ce-${gitlab_version}.deb" + +# Action to do in case of failure of the package_check +package_check_action() { + local sysctl_file="$final_path/embedded/cookbooks/package/resources/gitlab_sysctl.rb" + ynh_replace_string --match_string="command \"sysctl -e \(.*\)\"" --replace_string="command \"sysctl -e \1 || true\"" --target_file=$sysctl_file + + sysctl_file="/opt/gitlab/embedded/cookbooks/package/recipes/sysctl.rb" + ynh_replace_string --match_string="command \"sysctl -e \(.*\)\"" --replace_string="command \"sysctl -e \1 || true\"" --target_file=$sysctl_file +} diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index c173b3f..28da331 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,4 +1,4 @@ -gitlab_version="12.10.3" +gitlab_version="13.0.0" # sha256sum found here: https://packages.gitlab.com/gitlab @@ -6,12 +6,12 @@ gitlab_x86_64_debian_version="$(lsb_release -sc)" if [ "$gitlab_x86_64_debian_version" = "buster" ] then - gitlab_x86_64_source_sha256="dcb8b3b770aa7645f6485d877915e4075da214185f631560df270cfe6de89f0d" + gitlab_x86_64_source_sha256="4322ea81b30118a1616765abf34bf6ed9442675bac91d027babfc31d97938fe9" else - gitlab_x86_64_source_sha256="f25c1b15a64eb74209185074363f58cc9082102210c7ef7434a6c82f39b1ffb6" + gitlab_x86_64_source_sha256="71bf1a95739f78131eb23e016d663e18954758d00a8960ec811067287e5bd797" fi -gitlab_arm_source_sha256="898bd6492f04846113babe7db95b82dfcf1cf6974fe63482231d8a723e2928fb" +gitlab_arm_source_sha256="bb98a9a282c3c712abc4f5f45d761e949a0347afd9288cfd24ce7529182de30e" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 20c097738250453eee582bbd15f353342fab0b3f Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 23 May 2020 20:33:47 +0200 Subject: [PATCH 39/75] fix upgrade --- scripts/upgrade | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c702141..31fb681 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -252,6 +252,14 @@ then source ./upgrade.d/upgrade.last.sh last_version=$gitlab_version + source_current_major_version () { + if [ -e "./upgrade.d/upgrade.$current_major_version.first.sh" ]; then + source ./upgrade.d/upgrade.$current_major_version.first.sh + elif [ -e "./upgrade.d/upgrade.$current_major_version.last.sh" ]; then + source ./upgrade.d/upgrade.$current_major_version.last.sh + fi + } + # To update gitlab from major version A to B, we have to go to the last minor version # of the major version A and then go to the first minor version of the major version B # to finally go to the current minor version of the major version B @@ -263,11 +271,7 @@ then current_major_version=${current_version%%.*} - if [ -e "./upgrade.d/upgrade.$current_major_version.first.sh" ]; then - source ./upgrade.d/upgrade.$current_major_version.first.sh - elif [ -e "./upgrade.d/upgrade.$current_major_version.last.sh" ]; then - source ./upgrade.d/upgrade.$current_major_version.last.sh - fi + source_current_major_version # if the version stored in the upgrade.$current_major_version.first.sh file is less than or equal # to the current version, and if the version stored in the upgrade.$current_major_version.last.sh file @@ -280,6 +284,7 @@ then fi if dpkg --compare-versions "$gitlab_version" "le" "$current_version"; then current_major_version=$(($current_major_version + 1)) + source_current_major_version fi fi From b1a3ac3c6ddd7f501c7b52ae6c4b696895b5011d Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 23 May 2020 23:08:49 +0200 Subject: [PATCH 40/75] fix portPuma migration --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 31fb681..e5c1a2e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -136,6 +136,8 @@ fi if [ -z "$portPuma" ]; then if [ -z "$(ynh_app_setting_get --app="$app" --key=unicorn_port)" ]; then portPuma=$(grep -F "unicorn['port']" "/etc/gitlab/gitlab.rb" | cut -d' ' -f3) + else + portPuma=$(ynh_app_setting_get --app="$app" --key=unicorn_port) fi ynh_app_setting_set --app=$app --key=puma_port --value=$portPuma ynh_app_setting_delete --app=$app --key=unicorn_port @@ -259,7 +261,7 @@ then source ./upgrade.d/upgrade.$current_major_version.last.sh fi } - + # To update gitlab from major version A to B, we have to go to the last minor version # of the major version A and then go to the first minor version of the major version B # to finally go to the current minor version of the major version B From a1ea2bac5dc7a08c0e8a334deb3a9793a2bf8d0c Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 30 May 2020 17:07:36 +0200 Subject: [PATCH 41/75] simplify upgrade script --- scripts/upgrade | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index e5c1a2e..0605a7e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -259,6 +259,9 @@ then source ./upgrade.d/upgrade.$current_major_version.first.sh elif [ -e "./upgrade.d/upgrade.$current_major_version.last.sh" ]; then source ./upgrade.d/upgrade.$current_major_version.last.sh + # Finish with the last migration if the file doesn't exist + else + source ./upgrade.d/upgrade.last.sh fi } @@ -290,11 +293,6 @@ then fi fi - # Finish with the last migration if the file doesn't exist - if [ ! -e "./upgrade.d/upgrade.$current_major_version.first.sh" ] && [ ! -e "./upgrade.d/upgrade.$current_major_version.last.sh" ]; then - source ./upgrade.d/upgrade.last.sh - fi - cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" From f40845e5ab65e22255a36e43b8fd10e3edbf10c6 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 4 Jun 2020 10:05:13 +0200 Subject: [PATCH 42/75] 13.0.4 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.12.last.sh | 8 ++++---- scripts/upgrade.d/upgrade.last.sh | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 56bdaee..e3ab117 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:** 13.0.0 +**Shipped version:** 13.0.4 ## Screenshots diff --git a/manifest.json b/manifest.json index 20feff5..7034e4d 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "13.0.0~ynh1", + "version": "13.0.4~ynh1", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.12.last.sh b/scripts/upgrade.d/upgrade.12.last.sh index f0eca8a..0e1e218 100644 --- a/scripts/upgrade.d/upgrade.12.last.sh +++ b/scripts/upgrade.d/upgrade.12.last.sh @@ -1,4 +1,4 @@ -gitlab_version="12.10.6" +gitlab_version="12.10.9" # sha256sum found here: https://packages.gitlab.com/gitlab @@ -6,12 +6,12 @@ gitlab_x86_64_debian_version="$(lsb_release -sc)" if [ "$gitlab_x86_64_debian_version" = "buster" ] then - gitlab_x86_64_source_sha256="8305869246a70fb033fda3ba533f7b3459e7a044c0777dbc0215d868d73a22e6" + gitlab_x86_64_source_sha256="09b87fa74ee1c0c6fec6b01fea1dfe76f31be89bb3fc761c89552250b462cd49" else - gitlab_x86_64_source_sha256="f7c5a76bbb3cd192328be09832cce81d85847f22e97677c46087d5d1b8234cba" + gitlab_x86_64_source_sha256="c80a72d87cbc1c0f0acb919afa2930b1b1b016b1e0478d09e03bbedc12948960" fi -gitlab_arm_source_sha256="2e44c2c96cb6f381565f68814657b2ac73f11609601d16d4de6c539a53bb358f" +gitlab_arm_source_sha256="c8632f81b94bec91caf8e912070d846a4f9e165f46d7a84ecae83a4ae12d5cda" gitlab_filename="gitlab-ce-${gitlab_version}.deb" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 28da331..e79c9bf 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,4 +1,4 @@ -gitlab_version="13.0.0" +gitlab_version="13.0.4" # sha256sum found here: https://packages.gitlab.com/gitlab @@ -6,12 +6,12 @@ gitlab_x86_64_debian_version="$(lsb_release -sc)" if [ "$gitlab_x86_64_debian_version" = "buster" ] then - gitlab_x86_64_source_sha256="4322ea81b30118a1616765abf34bf6ed9442675bac91d027babfc31d97938fe9" + gitlab_x86_64_source_sha256="a98cdf17d2231b4ef1b4a4e2b743b0701aab6702552fad9c60d92e2c2928fc43" else - gitlab_x86_64_source_sha256="71bf1a95739f78131eb23e016d663e18954758d00a8960ec811067287e5bd797" + gitlab_x86_64_source_sha256="e806c80281f7b5b7c00a7c342072b137aa1fdf06db934855babee4d168c2fd2b" fi -gitlab_arm_source_sha256="bb98a9a282c3c712abc4f5f45d761e949a0347afd9288cfd24ce7529182de30e" +gitlab_arm_source_sha256="5e85e991bb1554ce5fa967e978c0b6870675df3cec2a99e8c4c5dabc28b94967" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From b2819f7da8a7889daff86633f5c769eb8be98ad2 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 4 Jun 2020 13:37:12 +0200 Subject: [PATCH 43/75] fix remove script --- scripts/remove | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/remove b/scripts/remove index c2c8ba3..4665184 100644 --- a/scripts/remove +++ b/scripts/remove @@ -21,6 +21,9 @@ portPuma=$(ynh_app_setting_get --app="$app" --key=puma_port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) config_path=$(ynh_app_setting_get --app=$app --key=config_path) +# Used by ynh_remove_nginx_config +domain=$(ynh_app_setting_get --app="$app" --key=domain) + #================================================= # STANDARD REMOVE #================================================= From 0ef8aef093ed7acaca4a47a72640fff6eef29f53 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 8 Jun 2020 17:46:46 +0200 Subject: [PATCH 44/75] update README --- README.md | 28 +++++++++++----------- README_fr.md | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 14 deletions(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index e3ab117..cb0d154 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ -# Gitlab for Yunohost +# GitLab for YunoHost [![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) -[![Install gitlab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab) +[![Install GitLab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab) -> *This package allow you to install gitlab quickly and simply on a YunoHost server. +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allow you to install GitLab quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* ## Overview @@ -18,29 +20,31 @@ GitLab is a web-based Git-repository manager providing wiki, issue-tracking and ## Configuration -How to configure this app: -- An admin panel -- The file: `/etc/gitlab/gitlab-persistent.rb` (use `sudo gitlab-ctl reconfigure` after any modification of this file) +How to configure GitLab: + +- With the GitLab admin panel. +- By editing the configuration file `/etc/gitlab/gitlab-persistent.rb` (use `sudo gitlab-ctl reconfigure` after any modification of this file). ## Documentation * Official documentation: https://docs.gitlab.com/ce/README.html + * YunoHost documentation: https://yunohost.org/#/app_gitlab ## YunoHost specific features #### Multi-users support -Yes with LDAP support. +* Are LDAP and HTTP auth supported? **Yes** +* Can the app be used by multiple users? **Yes** #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/gitlab%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/gitlab/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/gitlab%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/gitlab/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/gitlab%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/gitlab/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/gitlab%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/gitlab/) ## Limitations -* Not compatible with a 32-bit architecture. +* GitLab is not compatible with 32-bit architectures. ## Links @@ -54,7 +58,6 @@ Yes with LDAP support. Developers info ---------------- -**Only if you want to use a testing branch for coding, instead of merging directly into master.** Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing). To try the testing branch, please proceed like that. @@ -63,6 +66,3 @@ sudo yunohost app install https://github.com/YunoHost-Apps/gitlab_ynh/tree/testi or sudo yunohost app upgrade gitlab -u https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug ``` - -**More information on the documentation page:** -https://yunohost.org/packaging_apps diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..9144311 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,68 @@ +# GitLab pour YunoHost + +[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) +[![Installer GitLab pour YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab) + +*[Read this readme in english.](./README.md)* + +> *Ce package vous permet d'installer GitLab rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* + +## Vue d'ensemble + +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.0.4 + +## Captures d'écran + +![](https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/GitLab_running_11.0_%282018-07%29.png/300px-GitLab_running_11.0_%282018-07%29.png) + +## Configuration + +Comment configurer GitLab : + +- Avec le panneau d'administration de GitLab. +- En éditant le fichier de configuration `/etc/gitlab/gitlab-persistent.rb` et en éxécutant la commande `sudo gitlab-ctl reconfigure` pour réactualiser la configuration. + +## Documentation + + * Documentation officielle : https://docs.gitlab.com/ce/README.html + * Documentation YunoHost : https://yunohost.org/#/app_gitlab_fr + +## Caractéristiques spécifiques YunoHost + +#### Support multi-utilisateurs + +* L'authentification LDAP et HTTP est-elle prise en charge ? **Oui** +* L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** + +#### Architectures supportées + +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/gitlab%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/gitlab/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/gitlab%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/gitlab/) + +## Limitations + +* L'application GitLab n'est pas compatible avec les architectures 32-bit. + +## Liens + + * Signaler un bug : https://github.com/YunoHost-Apps/gitlab_ynh/issues + * Site de l'application : https://gitlab.com + * Dépôt de l'application principale : https://gitlab.com/gitlab-org/omnibus-gitlab - https://gitlab.com/gitlab-org/gitlab-ce + * Site web YunoHost : https://yunohost.org/ + +--- + +Informations pour les développeurs +---------------- + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug +or +sudo yunohost app upgrade gitlab -u https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug +``` From 11b9744cd39669c10032d68fe5c441b81bdb2c11 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 8 Jun 2020 17:50:32 +0200 Subject: [PATCH 45/75] bigger screenshots --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cb0d154..cee6dcf 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ GitLab is a web-based Git-repository manager providing wiki, issue-tracking and ## Screenshots -![](https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/GitLab_running_11.0_%282018-07%29.png/300px-GitLab_running_11.0_%282018-07%29.png) +![](https://upload.wikimedia.org/wikipedia/commons/9/9a/GitLab_running_11.0_%282018-07%29.png) ## Configuration diff --git a/README_fr.md b/README_fr.md index 9144311..05cd680 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ GitLab est un gestionnaire Web de dépôt Git fournissant des fonctionnalités d ## Captures d'écran -![](https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/GitLab_running_11.0_%282018-07%29.png/300px-GitLab_running_11.0_%282018-07%29.png) +![](https://upload.wikimedia.org/wikipedia/commons/9/9a/GitLab_running_11.0_%282018-07%29.png) ## Configuration From ae2358f78f198054c301ed79b6977048568ae720 Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 23 Jun 2020 12:34:04 +0200 Subject: [PATCH 46/75] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index fe6a8d4..33e8db9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -67,7 +67,7 @@ if [ -z "$puma_worker_processes" ]; then puma_worker_processes=$(( $(nproc) > 2 ? $(nproc) : 2 )) # If the server has less than 2GB of RAM - if [ $(ynh_check_ram --no_swap) -lt 2000 ]; then + if [ $(ynh_get_ram --total --ignore_swap) -lt 2000 ]; then puma_min_threads=1 puma_max_threads=1 else From 0d1d8ffa6ba4cfde42cbcc9f6627ee38a81e4beb Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 23 Jun 2020 12:34:19 +0200 Subject: [PATCH 47/75] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index ce60872..7037ad0 100644 --- a/scripts/install +++ b/scripts/install @@ -106,8 +106,8 @@ ynh_install_app_dependencies $pkg_dependencies #https://docs.gitlab.com/ce/install/requirements.html#puma-workers puma_worker_processes=$(( $(nproc) > 2 ? $(nproc) : 2 )) -# If the server has at least 2GB of RAM -if [ $(ynh_get_ram --total --ignore_swap) -ge 2000 ]; then +# If the server has less than 2GB of RAM +if [ $(ynh_get_ram --total --ignore_swap) -lt 2000 ]; then puma_min_threads=1 puma_max_threads=1 else From 3615c258a2bc7dcd0824641f16b848bcd15c8d13 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 23 Jun 2020 13:28:57 +0200 Subject: [PATCH 48/75] 13.1.0 --- README.md | 2 +- README_fr.md | 2 +- conf/gitlab.rb | 89 ++++++++++++++++++++++++--- manifest.json | 2 +- scripts/upgrade.d/upgrade.11.last.sh | 2 + scripts/upgrade.d/upgrade.12.first.sh | 2 + scripts/upgrade.d/upgrade.12.last.sh | 10 +-- scripts/upgrade.d/upgrade.13.first.sh | 27 ++++++++ scripts/upgrade.d/upgrade.last.sh | 16 +++-- 9 files changed, 130 insertions(+), 22 deletions(-) create mode 100644 scripts/upgrade.d/upgrade.13.first.sh diff --git a/README.md b/README.md index cee6dcf..5f96760 100644 --- a/README.md +++ b/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.0.4 +**Shipped version:** 13.1.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 05cd680..90aa85f 100644 --- a/README_fr.md +++ b/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.0.4 +**Version incluse :** 13.1.0 ## Captures d'écran diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 520295e..4238211 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -103,6 +103,17 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['gitlab_username_changing_enabled'] = true ### Default Theme +### Available values: +##! `1` for Indigo +##! `2` for Dark +##! `3` for Light +##! `4` for Blue +##! `5` for Green +##! `6` for Light Indigo +##! `7` for Light Blue +##! `8` for Light Green +##! `9` for Red +##! `10` for Light Red # gitlab_rails['gitlab_default_theme'] = 2 ### Default project feature settings @@ -792,7 +803,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ##! Long polling duration for job requesting for runners # gitlab_workhorse['api_ci_long_polling_duration'] = "60s" -##! Log format: default is text, can also be json or none. +##! Log format: default is json, can also be text or none. # gitlab_workhorse['log_format'] = "json" # gitlab_workhorse['env_directory'] = "/opt/gitlab/etc/gitlab-workhorse/env" @@ -827,7 +838,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ##! Docs: https://docs.gitlab.com/omnibus/settings/unicorn.html ################################################################################ -unicorn['enable'] = false +# unicorn['enable'] = false # unicorn['worker_timeout'] = 60 ###! Minimum worker_processes is 2 at this moment ###! See https://gitlab.com/gitlab-org/gitlab-foss/issues/18771 @@ -960,6 +971,12 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # postgresql['enable'] = true # postgresql['listen_address'] = nil # postgresql['port'] = 5432 + +## Only used when Patroni is enabled. This is the port that PostgreSQL responds to other +## cluster members. This port is used by Patroni to advertize the PostgreSQL connection +## endpoint to the cluster. By default it is the same as postgresql['port']. +# postgresql['connect_port'] = 5432 + # postgresql['data_dir'] = "/var/opt/gitlab/postgresql/data" ##! **recommend value is 1/4 of total RAM, up to 14GB.** @@ -1286,7 +1303,7 @@ nginx['listen_https'] = false # nginx['gzip_http_version'] = "1.0" # nginx['gzip_comp_level'] = "2" # nginx['gzip_proxied'] = "any" -# nginx['gzip_types'] = [ "text/html", "text/plain", "text/css", "application/x-javascript", "text/xml", "application/xml", "application/xml+rss", "text/javascript", "application/json" ] +# nginx['gzip_types'] = [ "text/plain", "text/css", "application/x-javascript", "text/xml", "application/xml", "application/xml+rss", "text/javascript", "application/json" ] # nginx['keepalive_timeout'] = 65 # nginx['cache_max_size'] = '5000m' # nginx['server_names_hash_bucket_size'] = 64 @@ -1437,9 +1454,6 @@ nginx['listen_https'] = false ##! Listen for requests forwarded by reverse proxy # gitlab_pages['listen_proxy'] = "localhost:8090" -##! Configure GitLab Pages to use an HTTP Proxy -# gitlab_pages['http_proxy'] = "http://example:8080" - # gitlab_pages['redirect_http'] = true # gitlab_pages['use_http2'] = true # gitlab_pages['dir'] = "/var/opt/gitlab/gitlab-pages" @@ -1917,11 +1931,11 @@ nginx['listen_https'] = false # praefect['wrapper_path'] = "/opt/gitlab/embedded/bin/gitaly-wrapper" # praefect['virtual_storage_name'] = "praefect" # praefect['failover_enabled'] = false -# praefect['failover_election_strategy'] = 'local' +# praefect['failover_election_strategy'] = 'sql' +# praefect['failover_read_only_after_failover'] = true # praefect['auth_token'] = "" # praefect['auth_transitioning'] = false # praefect['listen_addr'] = "localhost:2305" -# praefect['postgres_queue_enabled'] = false # 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" @@ -2168,7 +2182,7 @@ nginx['listen_https'] = false # gitlab_rails['geo_node_name'] = nil # gitlab_rails['geo_registry_replication_enabled'] = true -# gitlab_rails['geo_registry_replication_primary_api_url'] = 'https://example.com:5000' +# gitlab_rails['geo_registry_replication_primary_api_url'] = 'https://example.com:5050' ################################################################################ @@ -2372,6 +2386,63 @@ nginx['listen_https'] = false # repmgr['daemon'] = true # repmgrd['enable'] = true +################################################################################ +# Patroni (EE only) +# +# NOTICE: Patroni is an experimental feature and subject to change. +# +################################################################################ +# patroni['enable'] = false + +# patroni['dir'] = '/var/opt/gitlab/patroni' +# patroni['data_dir'] = '/var/opt/gitlab/patroni/data' +# patroni['ctl_command'] = '/opt/gitlab/embedded/bin/patronictl' + +# patroni['scope'] = 'gitlab-postgresql-ha' +# patroni['name'] = nil + +# patroni['log_directory'] = '/var/log/gitlab/patroni' +# patroni['log_level'] = 'INFO' + +# patroni['consul']['url'] = 'http://127.0.0.1:8500' +# patroni['consul']['service_check_interval'] = '10s' +# patroni['consul']['register_service'] = false +# patroni['consul']['checks'] = [] + +## Bootstrap settings +# patroni['loop_wait'] = 10 +# patroni['ttl'] = 30 +# patroni['retry_timeout'] = 10 +# patroni['maximum_lag_on_failover'] = 1_048_576 +# patroni['max_timelines_history'] = 0 +# patroni['master_start_timeout'] = 300 + +## PostgreSQL configuration override +# patroni['postgresql']['wal_level'] = 'replica' +# patroni['postgresql']['hot_standby'] = 'on' +# patroni['postgresql']['wal_keep_segments'] = 8 +# patroni['postgresql']['max_wal_senders'] = 5 +# patroni['postgresql']['max_replication_slots'] = 5 +# patroni['postgresql']['checkpoint_timeout'] = 30 + +# patroni['use_pg_rewind'] = false +# patroni['use_slots'] = true + +## The address and port that Patroni API binds to and listens on. +# patroni['listen_address'] = nil +# patroni['port'] = '8008' + +## The address of the Patroni node that is advertized to other cluster +## members to communicate with its API and PostgreSQL. If it is not specified, +## it tries to use the first available private IP and falls back to the default +## network interface. +# patroni['connect_address'] = nil + +## The port that Patroni API responds to other cluster members. This port is +## advertized and by default is the same as patroni['port']. +# patroni['connect_port'] = '8008' + + ################################################################################ # Consul (EEP only) ################################################################################ diff --git a/manifest.json b/manifest.json index e34c20e..c06c406 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "13.0.4~ynh1", + "version": "13.1.0~ynh1", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.11.last.sh b/scripts/upgrade.d/upgrade.11.last.sh index b25d5f4..f48b76d 100644 --- a/scripts/upgrade.d/upgrade.11.last.sh +++ b/scripts/upgrade.d/upgrade.11.last.sh @@ -1,3 +1,5 @@ +#!/bin/bash + gitlab_version="11.11.5" # There is no buster version for gitlab 11.X diff --git a/scripts/upgrade.d/upgrade.12.first.sh b/scripts/upgrade.d/upgrade.12.first.sh index f814a09..b04b05a 100644 --- a/scripts/upgrade.d/upgrade.12.first.sh +++ b/scripts/upgrade.d/upgrade.12.first.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # It's required to upgrade to the latest 12.0.x version before to another 12.X verion. gitlab_version="12.0.12" diff --git a/scripts/upgrade.d/upgrade.12.last.sh b/scripts/upgrade.d/upgrade.12.last.sh index 0e1e218..b54fa08 100644 --- a/scripts/upgrade.d/upgrade.12.last.sh +++ b/scripts/upgrade.d/upgrade.12.last.sh @@ -1,4 +1,6 @@ -gitlab_version="12.10.9" +#!/bin/bash + +gitlab_version="12.10.11" # sha256sum found here: https://packages.gitlab.com/gitlab @@ -6,12 +8,12 @@ gitlab_x86_64_debian_version="$(lsb_release -sc)" if [ "$gitlab_x86_64_debian_version" = "buster" ] then - gitlab_x86_64_source_sha256="09b87fa74ee1c0c6fec6b01fea1dfe76f31be89bb3fc761c89552250b462cd49" + gitlab_x86_64_source_sha256="1e5564604ddeb6bd8b152856e81a01230b5c66e41e1c07ac9f9f7c4593245b3c" else - gitlab_x86_64_source_sha256="c80a72d87cbc1c0f0acb919afa2930b1b1b016b1e0478d09e03bbedc12948960" + gitlab_x86_64_source_sha256="75bff35148b64cf08cd428103c5fc90b597b5f20b4feede38019bdcaa33a3fda" fi -gitlab_arm_source_sha256="c8632f81b94bec91caf8e912070d846a4f9e165f46d7a84ecae83a4ae12d5cda" +gitlab_arm_source_sha256="07581f11cf2c76fe00afb7577df14fec86af1aa9c5ea6b3aea4997397e5915c6" gitlab_filename="gitlab-ce-${gitlab_version}.deb" diff --git a/scripts/upgrade.d/upgrade.13.first.sh b/scripts/upgrade.d/upgrade.13.first.sh new file mode 100644 index 0000000..c90e212 --- /dev/null +++ b/scripts/upgrade.d/upgrade.13.first.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +gitlab_version="13.0.6" + +# sha256sum found here: https://packages.gitlab.com/gitlab + +gitlab_x86_64_debian_version="$(lsb_release -sc)" + +if [ "$gitlab_x86_64_debian_version" = "buster" ] +then + gitlab_x86_64_source_sha256="91a3486de88d1f0ce108d0f0c9adafc83e24c678e5ce2750ec8d52d75e467c1d" +else + gitlab_x86_64_source_sha256="175df478d80d15cbc19b69dee0c312058ba0530bed34f13050a25bb5b280315c" +fi + +gitlab_arm_source_sha256="cfd4f0f72ec2068d1566dd8699adedef210ada30644885e0d74beded3dd1b2b3" + +gitlab_filename="gitlab-ce-${gitlab_version}.deb" + +# Action to do in case of failure of the package_check +package_check_action() { + local sysctl_file="$final_path/embedded/cookbooks/package/resources/gitlab_sysctl.rb" + ynh_replace_string --match_string="command \"sysctl -e \(.*\)\"" --replace_string="command \"sysctl -e \1 || true\"" --target_file=$sysctl_file + + sysctl_file="/opt/gitlab/embedded/cookbooks/package/recipes/sysctl.rb" + ynh_replace_string --match_string="command \"sysctl -e \(.*\)\"" --replace_string="command \"sysctl -e \1 || true\"" --target_file=$sysctl_file +} \ No newline at end of file diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index e79c9bf..39d6043 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,4 +1,6 @@ -gitlab_version="13.0.4" +#!/bin/bash + +gitlab_version="13.1.0" # sha256sum found here: https://packages.gitlab.com/gitlab @@ -6,12 +8,14 @@ gitlab_x86_64_debian_version="$(lsb_release -sc)" if [ "$gitlab_x86_64_debian_version" = "buster" ] then - gitlab_x86_64_source_sha256="a98cdf17d2231b4ef1b4a4e2b743b0701aab6702552fad9c60d92e2c2928fc43" -else - gitlab_x86_64_source_sha256="e806c80281f7b5b7c00a7c342072b137aa1fdf06db934855babee4d168c2fd2b" -fi + gitlab_x86_64_source_sha256="0ea54906b2f29f0bfcc9d4cad99ea399966055b1418633d0f62d46aea020877d" -gitlab_arm_source_sha256="5e85e991bb1554ce5fa967e978c0b6870675df3cec2a99e8c4c5dabc28b94967" + gitlab_arm_source_sha256="2f7b2cc169a6de6152abf927214ee47f26634a5fa24ee55535ba7bb5074fd2b5" +else + gitlab_x86_64_source_sha256="c16d69de22fa701dbb4755756544c839ae82a519ac3516901f644add89ff1767" + + gitlab_arm_source_sha256="f24b6f085b1b1a426a277085b51f17d6821aaca8ff12dd888b4d294ecb9fef68" +fi gitlab_filename="gitlab-ce-${gitlab_version}.deb" From ebdafc30aef8fe010e729924cb5bd6a6a4349f7d Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 24 Jun 2020 11:00:24 +0200 Subject: [PATCH 49/75] Fix upgrade --- scripts/upgrade | 57 +++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 33e8db9..75164eb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -209,34 +209,6 @@ fi ynh_script_progression --message="Adding $swap_needed Mo to swap..." --weight=1 ynh_add_swap --size=$swap_needed -#================================================= -# PRECONFIGURE GITLAB -#================================================= - -ynh_script_progression --message="Preconfigure gitlab..." --weight=1 - -ynh_backup_if_checksum_is_different --file="$config_path/gitlab.rb" - -mkdir -p $config_path - -cp -f ../conf/gitlab.rb "$config_path/gitlab.rb" -ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+") - -ynh_replace_string --match_string="__GENERATED_EXTERNAL_URL__" --replace_string="https://$domain${path_url%/}" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__PUMA_PORT__" --replace_string="$portPuma" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__PUMA_WORKER_PROCESSES__" --replace_string="$puma_worker_processes" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__PUMA_MIN_THREADS__" --replace_string="$puma_min_threads" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__PUMA_MAX_THREADS__" --replace_string="$puma_max_threads" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__CLIENT_MAX_BODY_SIZE__" --replace_string="$client_max_body_size" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__SSH_PORT__" --replace_string="$ssh_port" --target_file="$config_path/gitlab.rb" -ynh_replace_string --match_string="__SIDEKIQ_PORT__" --replace_string="$portSidekiq" --target_file="$config_path/gitlab.rb" - -ynh_store_file_checksum --file="$config_path/gitlab.rb" - -touch "$config_path/gitlab-persistent.rb" -chown admin: "$config_path/gitlab-persistent.rb" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -320,6 +292,35 @@ then done fi +#================================================= +# RECONFIGURE GITLAB +#================================================= +ynh_script_progression --message="Reconfigure gitlab..." --weight=13 + +ynh_backup_if_checksum_is_different --file="$config_path/gitlab.rb" + +mkdir -p $config_path + +cp -f ../conf/gitlab.rb "$config_path/gitlab.rb" +ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+") + +ynh_replace_string --match_string="__GENERATED_EXTERNAL_URL__" --replace_string="https://$domain${path_url%/}" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_PORT__" --replace_string="$portPuma" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_WORKER_PROCESSES__" --replace_string="$puma_worker_processes" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_MIN_THREADS__" --replace_string="$puma_min_threads" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__PUMA_MAX_THREADS__" --replace_string="$puma_max_threads" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__CLIENT_MAX_BODY_SIZE__" --replace_string="$client_max_body_size" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__SSH_PORT__" --replace_string="$ssh_port" --target_file="$config_path/gitlab.rb" +ynh_replace_string --match_string="__SIDEKIQ_PORT__" --replace_string="$portSidekiq" --target_file="$config_path/gitlab.rb" + +ynh_store_file_checksum --file="$config_path/gitlab.rb" + +touch "$config_path/gitlab-persistent.rb" +chown admin: "$config_path/gitlab-persistent.rb" + +gitlab-ctl reconfigure + #================================================= # NGINX CONFIGURATION #================================================= From 98e0c720ce77c82408bd4808e292ad3997feff05 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 15 Jul 2020 11:02:10 +0200 Subject: [PATCH 50/75] move/rename some variables for an easier upgrade --- conf/arm.src.default | 2 +- scripts/upgrade | 9 ++------ scripts/upgrade.d/upgrade.11.last.sh | 14 +++++++++--- scripts/upgrade.d/upgrade.12.first.sh | 14 +++++++++--- scripts/upgrade.d/upgrade.12.last.sh | 28 +++++++++++++++++------- scripts/upgrade.d/upgrade.13.first.sh | 29 ++++++++++++++++++------- scripts/upgrade.d/upgrade.last.sh | 31 ++++++++++++++++++++------- 7 files changed, 89 insertions(+), 38 deletions(-) diff --git a/conf/arm.src.default b/conf/arm.src.default index 7f97efe..f6fd120 100644 --- a/conf/arm.src.default +++ b/conf/arm.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/stretch/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/scripts/upgrade b/scripts/upgrade index 75164eb..4ff3be6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -268,13 +268,8 @@ then cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" - - if [ $architecture = "x86-64" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_x86_64_source_sha256" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_version" --target_file="../conf/$architecture.src" - elif [ $architecture = "arm" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_arm_source_sha256" --target_file="../conf/$architecture.src" - fi + ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/upgrade.d/upgrade.11.last.sh b/scripts/upgrade.d/upgrade.11.last.sh index f48b76d..c41b196 100644 --- a/scripts/upgrade.d/upgrade.11.last.sh +++ b/scripts/upgrade.d/upgrade.11.last.sh @@ -3,11 +3,19 @@ gitlab_version="11.11.5" # There is no buster version for gitlab 11.X -gitlab_x86_64_debian_version="stretch" +gitlab_debian_version="stretch" -gitlab_x86_64_source_sha256="1ee3d6e8d2cc198f5466de0884c03f6016299db24859126af9a191501dbdef10" +gitlab_x86_64_stretch_source_sha256="1ee3d6e8d2cc198f5466de0884c03f6016299db24859126af9a191501dbdef10" -gitlab_arm_source_sha256="366e12b1f3d3b1694fcb6f13da9de908360ba93f75768d97e8d01e61e8652705" +gitlab_arm_stretch_source_sha256="366e12b1f3d3b1694fcb6f13da9de908360ba93f75768d97e8d01e61e8652705" + +architecture=$(ynh_app_setting_get --app="$app" --key=architecture) + +if [ "$architecture" = "x86-64" ]; then + gitlab_source_sha256=$gitlab_x86_64_stretch_source_sha256 +elif [ "$architecture" = "arm" ]; then + gitlab_source_sha256=$gitlab_arm_stretch_source_sha256 +fi gitlab_filename="gitlab-ce-${gitlab_version}.deb" diff --git a/scripts/upgrade.d/upgrade.12.first.sh b/scripts/upgrade.d/upgrade.12.first.sh index b04b05a..2ae8de4 100644 --- a/scripts/upgrade.d/upgrade.12.first.sh +++ b/scripts/upgrade.d/upgrade.12.first.sh @@ -4,11 +4,19 @@ gitlab_version="12.0.12" # There is no buster version for gitlab 12.0.X -gitlab_x86_64_debian_version="stretch" +gitlab_debian_version="stretch" -gitlab_x86_64_source_sha256="e80cda4c328c2627278a3d74dbdd53420e1fec9ecbeaeb5d4dcb4773726e5904" +gitlab_x86_64_stretch_source_sha256="e80cda4c328c2627278a3d74dbdd53420e1fec9ecbeaeb5d4dcb4773726e5904" -gitlab_arm_source_sha256="a0862e3c31b61d9274a55b7307d15daa5258473ccb97b8ae0d807f7474c971df" +gitlab_arm_stretch_source_sha256="a0862e3c31b61d9274a55b7307d15daa5258473ccb97b8ae0d807f7474c971df" + +architecture=$(ynh_app_setting_get --app="$app" --key=architecture) + +if [ "$architecture" = "x86-64" ]; then + gitlab_source_sha256=$gitlab_x86_64_stretch_source_sha256 +elif [ "$architecture" = "arm" ]; then + gitlab_source_sha256=$gitlab_arm_stretch_source_sha256 +fi gitlab_filename="gitlab-ce-${gitlab_version}.deb" diff --git a/scripts/upgrade.d/upgrade.12.last.sh b/scripts/upgrade.d/upgrade.12.last.sh index b54fa08..44e2461 100644 --- a/scripts/upgrade.d/upgrade.12.last.sh +++ b/scripts/upgrade.d/upgrade.12.last.sh @@ -4,17 +4,29 @@ gitlab_version="12.10.11" # sha256sum found here: https://packages.gitlab.com/gitlab -gitlab_x86_64_debian_version="$(lsb_release -sc)" +gitlab_x86_64_buster_source_sha256="1e5564604ddeb6bd8b152856e81a01230b5c66e41e1c07ac9f9f7c4593245b3c" -if [ "$gitlab_x86_64_debian_version" = "buster" ] -then - gitlab_x86_64_source_sha256="1e5564604ddeb6bd8b152856e81a01230b5c66e41e1c07ac9f9f7c4593245b3c" -else - gitlab_x86_64_source_sha256="75bff35148b64cf08cd428103c5fc90b597b5f20b4feede38019bdcaa33a3fda" +gitlab_x86_64_stretch_source_sha256="75bff35148b64cf08cd428103c5fc90b597b5f20b4feede38019bdcaa33a3fda" + +gitlab_arm_stretch_source_sha256="07581f11cf2c76fe00afb7577df14fec86af1aa9c5ea6b3aea4997397e5915c6" + +architecture=$(ynh_app_setting_get --app="$app" --key=architecture) + +if [ "$architecture" = "x86-64" ]; then + gitlab_debian_version="$(lsb_release -sc)" + + if [ "$gitlab_debian_version" = "buster" ] + then + gitlab_source_sha256=$gitlab_x86_64_buster_source_sha256 + else + gitlab_source_sha256=$gitlab_x86_64_stretch_source_sha256 + fi +elif [ "$architecture" = "arm" ]; then + gitlab_debian_version="stretch" + + gitlab_source_sha256=$gitlab_arm_stretch_source_sha256 fi -gitlab_arm_source_sha256="07581f11cf2c76fe00afb7577df14fec86af1aa9c5ea6b3aea4997397e5915c6" - gitlab_filename="gitlab-ce-${gitlab_version}.deb" # Action to do in case of failure of the package_check diff --git a/scripts/upgrade.d/upgrade.13.first.sh b/scripts/upgrade.d/upgrade.13.first.sh index c90e212..fbda037 100644 --- a/scripts/upgrade.d/upgrade.13.first.sh +++ b/scripts/upgrade.d/upgrade.13.first.sh @@ -1,20 +1,33 @@ #!/bin/bash +# It's required to upgrade to the latest 13.0.x version before to another 13.X verion. gitlab_version="13.0.6" # sha256sum found here: https://packages.gitlab.com/gitlab -gitlab_x86_64_debian_version="$(lsb_release -sc)" +gitlab_x86_64_buster_source_sha256="91a3486de88d1f0ce108d0f0c9adafc83e24c678e5ce2750ec8d52d75e467c1d" -if [ "$gitlab_x86_64_debian_version" = "buster" ] -then - gitlab_x86_64_source_sha256="91a3486de88d1f0ce108d0f0c9adafc83e24c678e5ce2750ec8d52d75e467c1d" -else - gitlab_x86_64_source_sha256="175df478d80d15cbc19b69dee0c312058ba0530bed34f13050a25bb5b280315c" +gitlab_x86_64_stretch_source_sha256="175df478d80d15cbc19b69dee0c312058ba0530bed34f13050a25bb5b280315c" + +gitlab_arm_stretch_source_sha256="cfd4f0f72ec2068d1566dd8699adedef210ada30644885e0d74beded3dd1b2b3" + +architecture=$(ynh_app_setting_get --app="$app" --key=architecture) + +if [ "$architecture" = "x86-64" ]; then + gitlab_debian_version="$(lsb_release -sc)" + + if [ "$gitlab_debian_version" = "buster" ] + then + gitlab_source_sha256=$gitlab_x86_64_buster_source_sha256 + else + gitlab_source_sha256=$gitlab_x86_64_stretch_source_sha256 + fi +elif [ "$architecture" = "arm" ]; then + gitlab_debian_version="stretch" + + gitlab_source_sha256=$gitlab_arm_stretch_source_sha256 fi -gitlab_arm_source_sha256="cfd4f0f72ec2068d1566dd8699adedef210ada30644885e0d74beded3dd1b2b3" - gitlab_filename="gitlab-ce-${gitlab_version}.deb" # Action to do in case of failure of the package_check diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 39d6043..4ddaa43 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -4,17 +4,32 @@ gitlab_version="13.1.0" # sha256sum found here: https://packages.gitlab.com/gitlab -gitlab_x86_64_debian_version="$(lsb_release -sc)" +gitlab_debian_version="$(lsb_release -sc)" -if [ "$gitlab_x86_64_debian_version" = "buster" ] -then - gitlab_x86_64_source_sha256="0ea54906b2f29f0bfcc9d4cad99ea399966055b1418633d0f62d46aea020877d" +gitlab_x86_64_buster_source_sha256="0ea54906b2f29f0bfcc9d4cad99ea399966055b1418633d0f62d46aea020877d" - gitlab_arm_source_sha256="2f7b2cc169a6de6152abf927214ee47f26634a5fa24ee55535ba7bb5074fd2b5" -else - gitlab_x86_64_source_sha256="c16d69de22fa701dbb4755756544c839ae82a519ac3516901f644add89ff1767" +gitlab_arm_buster_source_sha256="2f7b2cc169a6de6152abf927214ee47f26634a5fa24ee55535ba7bb5074fd2b5" - gitlab_arm_source_sha256="f24b6f085b1b1a426a277085b51f17d6821aaca8ff12dd888b4d294ecb9fef68" +gitlab_x86_64_stretch_source_sha256="c16d69de22fa701dbb4755756544c839ae82a519ac3516901f644add89ff1767" + +gitlab_arm_stretch_source_sha256="f24b6f085b1b1a426a277085b51f17d6821aaca8ff12dd888b4d294ecb9fef68" + +architecture=$(ynh_app_setting_get --app="$app" --key=architecture) + +if [ "$architecture" = "x86-64" ]; then + if [ "$gitlab_debian_version" = "buster" ] + then + gitlab_source_sha256=$gitlab_x86_64_buster_source_sha256 + else + gitlab_source_sha256=$gitlab_x86_64_stretch_source_sha256 + fi +elif [ "$architecture" = "arm" ]; then + if [ "$gitlab_debian_version" = "buster" ] + then + gitlab_source_sha256=$gitlab_arm_buster_source_sha256 + else + gitlab_source_sha256=$gitlab_arm_stretch_source_sha256 + fi fi gitlab_filename="gitlab-ce-${gitlab_version}.deb" From c4cb987990828ab6d818f3e28c6d811a6e642006 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 15 Jul 2020 11:12:49 +0200 Subject: [PATCH 51/75] 13.1.4 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.12.last.sh | 8 ++++---- scripts/upgrade.d/upgrade.13.first.sh | 8 ++++---- scripts/upgrade.d/upgrade.last.sh | 10 +++++----- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 5f96760..b3927ae 100644 --- a/README.md +++ b/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.0 +**Shipped version:** 13.1.4 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 90aa85f..bb30787 100644 --- a/README_fr.md +++ b/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.0 +**Version incluse :** 13.1.4 ## Captures d'écran diff --git a/manifest.json b/manifest.json index c06c406..63ea0cf 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "13.1.0~ynh1", + "version": "13.1.4~ynh1", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." diff --git a/scripts/upgrade.d/upgrade.12.last.sh b/scripts/upgrade.d/upgrade.12.last.sh index 44e2461..c1b8fb8 100644 --- a/scripts/upgrade.d/upgrade.12.last.sh +++ b/scripts/upgrade.d/upgrade.12.last.sh @@ -1,14 +1,14 @@ #!/bin/bash -gitlab_version="12.10.11" +gitlab_version="12.10.12" # sha256sum found here: https://packages.gitlab.com/gitlab -gitlab_x86_64_buster_source_sha256="1e5564604ddeb6bd8b152856e81a01230b5c66e41e1c07ac9f9f7c4593245b3c" +gitlab_x86_64_buster_source_sha256="17df2dfa71678109f7f1031b43d7c4e30ae34749258b9f48dd49380dd9cc3488" -gitlab_x86_64_stretch_source_sha256="75bff35148b64cf08cd428103c5fc90b597b5f20b4feede38019bdcaa33a3fda" +gitlab_x86_64_stretch_source_sha256="fbe744d04544465f6c97fd6fbc0dc11fb36ce2a75c4e943d911027b189634bee" -gitlab_arm_stretch_source_sha256="07581f11cf2c76fe00afb7577df14fec86af1aa9c5ea6b3aea4997397e5915c6" +gitlab_arm_stretch_source_sha256="43fc988516251295653d660b927a311593c22df31b58e5d3d91f40c8164a08ee" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) diff --git a/scripts/upgrade.d/upgrade.13.first.sh b/scripts/upgrade.d/upgrade.13.first.sh index fbda037..cdf1dee 100644 --- a/scripts/upgrade.d/upgrade.13.first.sh +++ b/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.6" +gitlab_version="13.0.10" # sha256sum found here: https://packages.gitlab.com/gitlab -gitlab_x86_64_buster_source_sha256="91a3486de88d1f0ce108d0f0c9adafc83e24c678e5ce2750ec8d52d75e467c1d" +gitlab_x86_64_buster_source_sha256="d2b964e313983e03c8920327972ccd500800745b37db95227977765ec1ae7f0d" -gitlab_x86_64_stretch_source_sha256="175df478d80d15cbc19b69dee0c312058ba0530bed34f13050a25bb5b280315c" +gitlab_x86_64_stretch_source_sha256="1d378f5488aeaafa08ffd05e316e384210ed53e572282d2a7270de6605d45b64" -gitlab_arm_stretch_source_sha256="cfd4f0f72ec2068d1566dd8699adedef210ada30644885e0d74beded3dd1b2b3" +gitlab_arm_stretch_source_sha256="cd5987686dcfa36acfd8ec37c9ac53a27c0f472948c9418745f0760b6e861ce3" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 4ddaa43..18779e4 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,18 +1,18 @@ #!/bin/bash -gitlab_version="13.1.0" +gitlab_version="13.1.4" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_buster_source_sha256="0ea54906b2f29f0bfcc9d4cad99ea399966055b1418633d0f62d46aea020877d" +gitlab_x86_64_buster_source_sha256="b39df97b871b2def2287ddf3995fc44f9afa1ad68982a0beecfc2740761b769a" -gitlab_arm_buster_source_sha256="2f7b2cc169a6de6152abf927214ee47f26634a5fa24ee55535ba7bb5074fd2b5" +gitlab_arm_buster_source_sha256="092b17f00cc36ccf08076c5194f8418e52c34a9f07aa6529d01ef0784c5bae88" -gitlab_x86_64_stretch_source_sha256="c16d69de22fa701dbb4755756544c839ae82a519ac3516901f644add89ff1767" +gitlab_x86_64_stretch_source_sha256="733ad6468e5ecd571a6233c88d1512c092591ada3f8bc24dcaa7f68f61d52d69" -gitlab_arm_stretch_source_sha256="f24b6f085b1b1a426a277085b51f17d6821aaca8ff12dd888b4d294ecb9fef68" +gitlab_arm_stretch_source_sha256="26266529281d9c0b6c6f7b1d29b97de2f9c08a2ffb86ada18f09f29cc0fd0fef" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From b6d25131ae92060b9f5a1a7fcce7f53356831417 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 15 Jul 2020 17:07:20 +0200 Subject: [PATCH 52/75] fix install/restore --- scripts/install | 9 ++------- scripts/restore | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/scripts/install b/scripts/install index 7037ad0..be3a555 100644 --- a/scripts/install +++ b/scripts/install @@ -181,13 +181,8 @@ source ./upgrade.d/upgrade.last.sh cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" - -if [ $architecture = "x86-64" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_x86_64_source_sha256" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_version" --target_file="../conf/$architecture.src" -elif [ $architecture = "arm" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_arm_source_sha256" --target_file="../conf/$architecture.src" -fi +ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" +ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/restore b/scripts/restore index 40e51d0..235d58e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -103,13 +103,8 @@ mkdir -p ../conf/ cp ../settings/conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" - -if [ $architecture = "x86-64" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_x86_64_source_sha256" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_x86_64_debian_version" --target_file="../conf/$architecture.src" -elif [ $architecture = "arm" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_arm_source_sha256" --target_file="../conf/$architecture.src" -fi +ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" +ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" From 42f0830ea3b2e9cbe50eba9d61b79e0f0e6a361b Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sat, 8 Aug 2020 09:05:21 +0200 Subject: [PATCH 53/75] 13.2.3 --- README.md | 2 +- README_fr.md | 2 +- conf/gitlab.rb | 38 ++++++++++++++++++++++++++- manifest.json | 2 +- scripts/upgrade.d/upgrade.13.first.sh | 8 +++--- scripts/upgrade.d/upgrade.last.sh | 10 +++---- 6 files changed, 49 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b3927ae..ecf69d1 100644 --- a/README.md +++ b/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 diff --git a/README_fr.md b/README_fr.md index bb30787..353a3ef 100644 --- a/README_fr.md +++ b/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 diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 4238211..87050ba 100644 --- a/conf/gitlab.rb +++ b/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 * * *" diff --git a/manifest.json b/manifest.json index 63ea0cf..52270c6 100644 --- a/manifest.json +++ b/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." diff --git a/scripts/upgrade.d/upgrade.13.first.sh b/scripts/upgrade.d/upgrade.13.first.sh index cdf1dee..0d1cf09 100644 --- a/scripts/upgrade.d/upgrade.13.first.sh +++ b/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) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 18779e4..76c5bbd 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/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) From ee7bec9ceb8036ecd2ce6e3d6b6e99eeee984d15 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 27 Aug 2020 12:33:33 +0200 Subject: [PATCH 54/75] Fix error message for arm64 --- scripts/install | 4 +++- scripts/upgrade | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index be3a555..fcf86b9 100644 --- a/scripts/install +++ b/scripts/install @@ -43,7 +43,9 @@ final_path=/opt/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Detect the system architecture -if [ -n "$(uname -m | grep 64)" ]; then +if [ -n "$(uname -m | grep aarch64)" ]; then + ynh_die "Gitlab is not compatible with arm64 architecture" +elif [ -n "$(uname -m | grep x86_64)" ]; then architecture="x86-64" elif [ -n "$(uname -m | grep 86)" ]; then ynh_die "Gitlab is not compatible with x86 architecture" diff --git a/scripts/upgrade b/scripts/upgrade index 4ff3be6..39cb226 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -84,8 +84,9 @@ fi # If architecture doesn't exist, create it if [ -z "$architecture" ]; then - # Detect the system architecture - if [ -n "$(uname -m | grep 64)" ]; then + if [ -n "$(uname -m | grep aarch64)" ]; then + ynh_die "Gitlab is not compatible with arm64 architecture" + elif [ -n "$(uname -m | grep x86_64)" ]; then architecture="x86-64" elif [ -n "$(uname -m | grep 86)" ]; then ynh_die "Gitlab is not compatible with x86 architecture" From 7adb05c4d6f5dfd59f076448c683dc7375a9f67d Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 27 Aug 2020 13:45:36 +0200 Subject: [PATCH 55/75] 13.3.1 --- README.md | 2 +- README_fr.md | 2 +- conf/gitlab.rb | 41 ++++++++++++++++++++----------- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 10 ++++---- 5 files changed, 35 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index ecf69d1..1988a1b 100644 --- a/README.md +++ b/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.2.3 +**Shipped version:** 13.3.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 353a3ef..99423cb 100644 --- a/README_fr.md +++ b/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.2.3 +**Version incluse :** 13.3.1 ## Captures d'écran diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 87050ba..9b930b3 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -19,8 +19,11 @@ ##! This file is generated during initial installation and **is not** modified ##! during upgrades. ##! Check out the latest version of this file to know about the different -##! settings that can be configured by this file, which may be found at: -##! https://gitlab.com/gitlab-org/omnibus-gitlab/raw/master/files/gitlab-config-template/gitlab.rb.template +##! settings that can be configured, when they were introduced and why: +##! https://gitlab.com/gitlab-org/omnibus-gitlab/blame/master/files/gitlab-config-template/gitlab.rb.template + +##! Locally, the complete template corresponding to the installed version can be found at: +##! /opt/gitlab/etc/gitlab.rb.template ##! You can run `gitlab-ctl diff-config` to compare the contents of the current gitlab.rb with ##! the gitlab.rb.template from the currently running version. @@ -152,6 +155,7 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['repository_check_worker_cron'] = "20 * * * *" # gitlab_rails['admin_email_worker_cron'] = "0 0 * * 0" # gitlab_rails['personal_access_tokens_expiring_worker_cron'] = "0 1 * * *" +# gitlab_rails['personal_access_tokens_expired_notification_worker_cron'] = "0 2 * * *" # gitlab_rails['repository_archive_cache_worker_cron'] = "0 * * * *" # gitlab_rails['pages_domain_verification_cron_worker'] = "*/15 * * * *" # gitlab_rails['pages_domain_ssl_renewal_cron_worker'] = "*/10 * * * *" @@ -271,6 +275,7 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! 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']['storage_options'] = {} gitlab_rails['object_store']['proxy_download'] = false gitlab_rails['object_store']['objects']['artifacts']['bucket'] = nil gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = nil @@ -369,7 +374,7 @@ gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = nil # gitlab_rails['terraform_state_enabled'] = true # gitlab_rails['terraform_state_storage_path'] = "/var/opt/gitlab/gitlab-rails/shared/terraform_state" # gitlab_rails['terraform_state_object_store_enabled'] = false -# gitlab_rails['terraform_state_object_store_remote_directory'] = "terraform_state" +# gitlab_rails['terraform_state_object_store_remote_directory'] = "terraform" # gitlab_rails['terraform_state_object_store_connection'] = { # 'provider' => 'AWS', # 'region' => 'eu-west-1', @@ -627,7 +632,6 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['db_encoding'] = "unicode" # gitlab_rails['db_collation'] = nil # gitlab_rails['db_database'] = "gitlabhq_production" -# gitlab_rails['db_pool'] = 1 # gitlab_rails['db_username'] = "gitlab" # gitlab_rails['db_password'] = nil # gitlab_rails['db_host'] = nil @@ -747,13 +751,17 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # registry['compatibility_schema1_enabled'] = false ### Registry backend storage -###! Docs: https://docs.gitlab.com/ee/administration/container_registry.html#container-registry-storage-driver +###! Docs: https://docs.gitlab.com/ee/administration/packages/container_registry.html#configure-storage-for-the-container-registry # registry['storage'] = { # 's3' => { -# 'accesskey' => 'AKIAKIAKI', -# 'secretkey' => 'secret123', -# 'region' => 'us-east-1', -# 'bucket' => 'gitlab-registry-bucket-AKIAKIAKI' +# 'accesskey' => 's3-access-key', +# 'secretkey' => 's3-secret-key-for-access-key', +# 'bucket' => 'your-s3-bucket', +# 'region' => 'your-s3-region', +# 'regionendpoint' => 'your-s3-regionendpoint' +# }, +# 'redirect' => { +# 'disable' => false # } # } @@ -898,7 +906,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ##! Docs: https://docs.gitlab.com/omnibus/settings/puma.html ################################################################################ -puma['enable'] = true +# puma['enable'] = true # puma['ha'] = false # puma['worker_timeout'] = 60 puma['worker_processes'] = __PUMA_WORKER_PROCESSES__ @@ -1513,15 +1521,23 @@ nginx['listen_https'] = false ##! GitLab API HTTP client connection timeout # gitlab_pages['gitlab_client_http_timeout'] = "10s" -##! GitLab API JWT Token expiry time" +##! GitLab API JWT Token expiry time # gitlab_pages['gitlab_client_jwt_expiry'] = "30s" +##! Domain configuration source, defaults to disk if set to nil +# gitlab_pages['domain_config_source'] = nil + ##! Define custom gitlab-pages HTTP headers for the whole instance # gitlab_pages['headers'] = [] ##! Shared secret used for authentication between Pages and GitLab # gitlab_pages['api_secret_key'] = nil # Will be generated if not set. Base64 encoded and exactly 32 bytes long. +# gitlab_pages['env_directory'] = "/opt/gitlab/etc/gitlab-pages/env" +# gitlab_pages['env'] = { +# 'SSL_CERT_DIR' => "#{node['package']['install-dir']}/embedded/ssl/certs/" +# } + ################################################################################ ## GitLab Pages NGINX ################################################################################ @@ -1966,7 +1982,6 @@ nginx['listen_https'] = false # praefect['virtual_storage_name'] = "praefect" # praefect['failover_enabled'] = false # praefect['failover_election_strategy'] = 'sql' -# praefect['failover_read_only_after_failover'] = true # praefect['auth_token'] = "" # praefect['auth_transitioning'] = false # praefect['listen_addr'] = "localhost:2305" @@ -2229,7 +2244,6 @@ nginx['listen_https'] = false # geo_secondary['db_encoding'] = "unicode" # geo_secondary['db_collation'] = nil # geo_secondary['db_database'] = "gitlabhq_geo_production" -# geo_secondary['db_pool'] = 1 # geo_secondary['db_username'] = "gitlab_geo" # geo_secondary['db_password'] = nil # geo_secondary['db_host'] = "/var/opt/gitlab/geo-postgresql" @@ -2239,7 +2253,6 @@ nginx['listen_https'] = false # geo_secondary['db_sslcompression'] = 0 # geo_secondary['db_sslrootcert'] = nil # geo_secondary['db_sslca'] = nil -# geo_secondary['db_fdw'] = true ################################################################################ ## GitLab Geo Secondary Tracking Database (EE only) diff --git a/manifest.json b/manifest.json index 52270c6..d6f0ba5 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "13.2.3~ynh1", + "version": "13.3.1~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 76c5bbd..5b15507 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,18 +1,18 @@ #!/bin/bash -gitlab_version="13.2.3" +gitlab_version="13.3.1" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_buster_source_sha256="0ecce1957260de9cca3325fc0772a5976d604f3d2d5a81e10cfda7aba4dd9f7b" +gitlab_x86_64_buster_source_sha256="20e4fcb15ac8fa8d94105230d6c895a4e4407ef11af81d67df08688bf68f9c41" -gitlab_arm_buster_source_sha256="0f5e1579ced77650950a062dd89dfb0c6c9a117c94c2204c9a10d6f37f0fe4d9" +gitlab_arm_buster_source_sha256="9451b77c17d543b8dc813354e8bbb6e110856978fac9152e72a185308c1e8b9e" -gitlab_x86_64_stretch_source_sha256="d4437de930401e5417d5afb093a3d307e3bccb1bf71cde2fd7c79f98577604e4" +gitlab_x86_64_stretch_source_sha256="41db62c708dd905198a05aeb63041f5103e639266914ecb1bb850bce9bdb12ca" -gitlab_arm_stretch_source_sha256="5dff5d413392c2ab1fd549e938e7cc17c39b82ced92a2efcd322e5e7193ce259" +gitlab_arm_stretch_source_sha256="b7228cffe3124d765a78e06665e4a2f6fdec926fc8b2b67be4605461e96de3d7" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From 4b8d8bc80289d5f8b1d6db8c68fa0b2d461a931d Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 27 Aug 2020 13:50:05 +0200 Subject: [PATCH 56/75] the script I use to update gitlab, because there are too many things to do every week --- upgrade-versions.sh | 117 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100755 upgrade-versions.sh diff --git a/upgrade-versions.sh b/upgrade-versions.sh new file mode 100755 index 0000000..ab9068a --- /dev/null +++ b/upgrade-versions.sh @@ -0,0 +1,117 @@ +#!/bin/bash + +file=$(basename $1) +version=$2 +current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +gitlab_directory="$( cd "$( dirname "$current_dir/$1" )/../../" >/dev/null 2>&1 && pwd )" + +sed -i -e "s/gitlab_version=\"[^0-9.]*[0-9.]*[0-9.]\"/gitlab_version=\"$version\"/" $gitlab_directory/scripts/upgrade.d/$file + +# x86_64 +for debian_version in "stretch" "buster" +do + url=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/$debian_version/gitlab-ce_$version-ce.0_amd64.deb + + new_sha256=$(curl -s $url | sed -n '/SHA256$/,/<\/tr>$/{ /SHA256$/d; /<\/tr>$/d; p; }' | cut -d$'\n' -f3 | xargs) + + echo url: $url + echo sha256: $new_sha256 + + sed -i -e "s/gitlab_x86_64_${debian_version}_source_sha256=\".*\"/gitlab_x86_64_${debian_version}_source_sha256=\"$new_sha256\"/" $gitlab_directory/scripts/upgrade.d/$file +done + +# arm +for debian_version in "stretch" "buster" +do + url=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/$debian_version/gitlab-ce_$version-ce.0_armhf.deb + + new_sha256=$(curl -s $url | sed -n '/SHA256$/,/<\/tr>$/{ /SHA256$/d; /<\/tr>$/d; p; }' | cut -d$'\n' -f3 | xargs) + + echo url: $url + echo sha256: $new_sha256 + + sed -i -e "s/gitlab_arm_${debian_version}_source_sha256=\".*\"/gitlab_arm_${debian_version}_source_sha256=\"$new_sha256\"/" $gitlab_directory/scripts/upgrade.d/$file +done + +if [[ "$(basename $file)" == upgrade.last.sh ]]; then + # Update manifest + sed -i -e "s/\"version\": \"[^0-9.]*[0-9.]*[0-9.]\"/\"version\": \"$version~ynh1\"/" $gitlab_directory/manifest.json + + # Update readme + sed -i -e "s/\*\*Shipped version:\*\* [^0-9.]*[0-9.]*[0-9.]/**Shipped version:** $version/" $gitlab_directory/README.md + sed -i -e "s/\*\*Version incluse :\*\* [^0-9.]*[0-9.]*[0-9.]/**Version incluse :** $version/" $gitlab_directory/README_fr.md + + # Update gitlab.rb + conf_file=$gitlab_directory/conf/gitlab.rb + + url=https://gitlab.com/gitlab-org/omnibus-gitlab/-/raw/$version+ce.0/files/gitlab-config-template/gitlab.rb.template + + header="################################################################################ +################################################################################ +## FOR YUNOHOST USERS ## +################################################################################ +################################################################################ + +# Please do not modify this file, it will be reset with the next update. +# You can create or modify the file: +# /etc/gitlab/gitlab-persistent.rb +# and add all the configuration you want. +# Options you add in gitlab-presistent.rb will overide these one, +# but you can use options and documentations in this file to know what +# is it possible to do. + +################################################################################ +################################################################################ +" + +footer=" +from_file '/etc/gitlab/gitlab-persistent.rb'" + echo "$header" > $conf_file + + curl -s "$url" >> $conf_file + + echo "$footer" >> $conf_file + + # Change external url + sed -i "s/external_url 'GENERATED_EXTERNAL_URL'/external_url '__GENERATED_EXTERNAL_URL__'/" $conf_file + + # Activate ldap + sed -i "s/# gitlab_rails\['ldap_enabled'\] = .*/gitlab_rails['ldap_enabled'] = true/" $conf_file + + ldap_conf=" +gitlab_rails['ldap_servers'] = YAML.load <<-'EOS' # remember to close this block with 'EOS' below + main: # 'main' is the GitLab 'provider ID' of this LDAP server + label: 'LDAP' + host: 'localhost' + port: 389 + uid: 'uid' + encryption: 'plain' # \"start_tls\" or \"simple_tls\" or \"plain\" + bind_dn: '' + password: '' + active_directory: false + allow_username_or_email_login: false + block_auto_created_users: false + base: 'ou=users,dc=yunohost,dc=org' + user_filter: '' +EOS" + + # Add ldap conf + sed -i "/^# EOS/r "<(echo "$ldap_conf") $conf_file + + # Change ssh port + sed -i "s/# gitlab_rails\['gitlab_shell_ssh_port'\] = 22/gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__/" $conf_file + + # Change puma settings + sed -i "s/# puma\['worker_processes'\] = .*/puma['worker_processes'] = __PUMA_WORKER_PROCESSES__/" $conf_file + sed -i "s/# puma\['min_threads'\] = .*/puma['min_threads'] = __PUMA_MIN_THREADS__/" $conf_file + sed -i "s/# puma\['max_threads'\] = .*/puma['max_threads'] = __PUMA_MAX_THREADS__/" $conf_file + sed -i "s/# puma\['port'\] = .*/puma['port'] = __PUMA_PORT__/" $conf_file + + # Change sidekiq settings + sed -i "s/# sidekiq\['listen_port'\] = .*/sidekiq['listen_port'] = __SIDEKIQ_PORT__/" $conf_file + + # Change nginx settings + sed -i "s/# nginx\['client_max_body_size'\] = .*/nginx['client_max_body_size'] = '__CLIENT_MAX_BODY_SIZE__'/" $conf_file + sed -i "s/# nginx\['listen_port'\] = .*/nginx['listen_port'] = __PORT__/" $conf_file + sed -i "s/# nginx\['listen_https'\] = .*/nginx['listen_https'] = false/" $conf_file +fi From 48d1833edd21e129daff24cf429ce82918b29b1c Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 27 Aug 2020 13:55:16 +0200 Subject: [PATCH 57/75] add usage --- upgrade-versions.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/upgrade-versions.sh b/upgrade-versions.sh index ab9068a..e1f6e17 100755 --- a/upgrade-versions.sh +++ b/upgrade-versions.sh @@ -1,5 +1,12 @@ #!/bin/bash +# /!\ This is a quick and dirty bash script, which does not respect the YNH format. + +# This script will upgrade sha256sum, manifest, readme and config template +# /!\ before committing the modifications, check if nothing is broken if files +# Usage: ./upgrade-versions.sh path_to_upgrade_file version +# Example: ./upgrade-versions.sh scripts/upgrade.d/upgrade.last.sh 13.3.1 + file=$(basename $1) version=$2 current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" From 28e1cf6956e821da58f9574d9cebf77a97525b49 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 8 Sep 2020 14:13:01 +0200 Subject: [PATCH 58/75] 13.3.4 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 10 +++++----- upgrade-versions.sh | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1988a1b..c0982e1 100644 --- a/README.md +++ b/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.3.1 +**Shipped version:** 13.3.4 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 99423cb..7466c55 100644 --- a/README_fr.md +++ b/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.3.1 +**Version incluse :** 13.3.4 ## Captures d'écran diff --git a/manifest.json b/manifest.json index d6f0ba5..325e843 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "13.3.1~ynh1", + "version": "13.3.4~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 5b15507..53e0692 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,18 +1,18 @@ #!/bin/bash -gitlab_version="13.3.1" +gitlab_version="13.3.4" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_buster_source_sha256="20e4fcb15ac8fa8d94105230d6c895a4e4407ef11af81d67df08688bf68f9c41" +gitlab_x86_64_buster_source_sha256="bf0d2924f10765d08724ea78d8f5ceff4dc4d25d14a5f282aa27d62640f21d23" -gitlab_arm_buster_source_sha256="9451b77c17d543b8dc813354e8bbb6e110856978fac9152e72a185308c1e8b9e" +gitlab_arm_buster_source_sha256="ee9b8ac7816dbedf73e319fea4c14ac1c743f06bad4a2597e5753f81789337d1" -gitlab_x86_64_stretch_source_sha256="41db62c708dd905198a05aeb63041f5103e639266914ecb1bb850bce9bdb12ca" +gitlab_x86_64_stretch_source_sha256="bc6800fdd5f91cb18c712ea15e93887141b81658566c780231aa63051cc9fcf0" -gitlab_arm_stretch_source_sha256="b7228cffe3124d765a78e06665e4a2f6fdec926fc8b2b67be4605461e96de3d7" +gitlab_arm_stretch_source_sha256="362ab23dfc97814027c428e23900337223d3ae4c1c9220ad35b7ffd341f666cc" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) diff --git a/upgrade-versions.sh b/upgrade-versions.sh index e1f6e17..ab630de 100755 --- a/upgrade-versions.sh +++ b/upgrade-versions.sh @@ -42,7 +42,7 @@ done if [[ "$(basename $file)" == upgrade.last.sh ]]; then # Update manifest - sed -i -e "s/\"version\": \"[^0-9.]*[0-9.]*[0-9.]\"/\"version\": \"$version~ynh1\"/" $gitlab_directory/manifest.json + sed -i -e "s/\"version\": \"[^0-9.]*[0-9.]*[0-9.]~ynh[0-9.]\"/\"version\": \"$version~ynh1\"/" $gitlab_directory/manifest.json # Update readme sed -i -e "s/\*\*Shipped version:\*\* [^0-9.]*[0-9.]*[0-9.]/**Shipped version:** $version/" $gitlab_directory/README.md From 1476eedf1c53503d61c3dfcba8d27ffbc7fcb398 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 24 Sep 2020 12:06:06 +0200 Subject: [PATCH 59/75] 13.4.0, drop stretch support --- README.md | 2 +- README_fr.md | 2 +- conf/gitlab.rb | 15 +++++++++++---- manifest.json | 4 ++-- scripts/upgrade.d/upgrade.last.sh | 26 +++++--------------------- upgrade-versions.sh | 26 ++++++++++---------------- 6 files changed, 30 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index c0982e1..fc1f0b0 100644 --- a/README.md +++ b/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.3.4 +**Shipped version:** 13.4.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 7466c55..15c0257 100644 --- a/README_fr.md +++ b/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.3.4 +**Version incluse :** 13.4.0 ## Captures d'écran diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 9b930b3..09bc780 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -161,6 +161,8 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['pages_domain_ssl_renewal_cron_worker'] = "*/10 * * * *" # gitlab_rails['pages_domain_removal_cron_worker'] = "47 0 * * *" # gitlab_rails['schedule_migrate_external_diffs_worker_cron'] = "15 * * * *" +# gitlab_rails['ci_platform_metrics_update_cron_worker'] = '47 9 * * *' +# gitlab_rails['analytics_instance_statistics_count_job_trigger_worker_cron'] = "50 23 */1 * *" ### Webhook Settings ###! Number of seconds to wait for HTTP response after sending webhook HTTP POST @@ -491,6 +493,7 @@ EOS # gitlab_rails['omniauth_block_auto_created_users'] = true # gitlab_rails['omniauth_auto_link_ldap_user'] = false # gitlab_rails['omniauth_auto_link_saml_user'] = false +# gitlab_rails['omniauth_auto_link_user'] = ['saml'] # gitlab_rails['omniauth_external_providers'] = ['twitter', 'google_oauth2'] # gitlab_rails['omniauth_allow_bypass_two_factor'] = ['google_oauth2'] # gitlab_rails['omniauth_providers'] = [ @@ -644,6 +647,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['db_sslkey'] = nil # gitlab_rails['db_prepared_statements'] = false # gitlab_rails['db_statements_limit'] = 1000 +# gitlab_rails['db_connect_timeout'] = nil ### GitLab Redis settings @@ -961,6 +965,7 @@ puma['port'] = __PUMA_PORT__ # sidekiq['negate'] = false # sidekiq['metrics_enabled'] = true +# sidekiq['exporter_log_enabled'] = false # sidekiq['listen_address'] = "localhost" sidekiq['listen_port'] = __SIDEKIQ_PORT__ @@ -1341,7 +1346,7 @@ nginx['listen_https'] = false # nginx['cache_max_size'] = '5000m' # nginx['server_names_hash_bucket_size'] = 64 ##! These paths have proxy_request_buffering disabled -# nginx['request_buffering_off_path_regex'] = "\.git/git-receive-pack$|\.git/info/refs?service=git-receive-pack$|\.git/gitlab-lfs/objects|\.git/info/lfs/objects/batch$" +# nginx['request_buffering_off_path_regex'] = "/api/v\\d/jobs/\\d+/artifacts$|\\.git/git-receive-pack$|\\.git/gitlab-lfs/objects|\\.git/info/lfs/objects/batch$" ### Nginx status # nginx['status'] = { @@ -1351,7 +1356,6 @@ nginx['listen_https'] = false # "port" => 9999, # "vts_enable" => true, # "options" => { -# "stub_status" => "on", # Turn on stats # "server_tokens" => "off", # Don't show the version of NGINX # "access_log" => "off", # Disable logs for stats # "allow" => "127.0.0.1", # Only allow access from localhost @@ -1672,6 +1676,7 @@ nginx['listen_https'] = false # prometheus['rules_files'] = ['/var/opt/gitlab/prometheus/rules/*.rules'] # prometheus['scrape_interval'] = 15 # prometheus['scrape_timeout'] = 15 +# prometheus['external_labels'] = { } # prometheus['env_directory'] = '/opt/gitlab/etc/prometheus/env' # prometheus['env'] = { # 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/" @@ -1742,8 +1747,8 @@ nginx['listen_https'] = false # alertmanager['log_directory'] = '/var/log/gitlab/alertmanager' # alertmanager['admin_email'] = 'admin@example.com' # alertmanager['flags'] = { -# 'web.listen-address' => "localhost:9093" -# 'storage.path' => "/var/opt/gitlab/alertmanager/data" +# 'web.listen-address' => "localhost:9093", +# 'storage.path' => "/var/opt/gitlab/alertmanager/data", # 'config.file' => "/var/opt/gitlab/alertmanager/alertmanager.yml" # } # alertmanager['env_directory'] = '/opt/gitlab/etc/alertmanager/env' @@ -2026,6 +2031,8 @@ nginx['listen_https'] = false # praefect['database_sslcert'] = '/path/to/client-cert' # praefect['database_sslkey'] = '/path/to/client-key' # praefect['database_sslrootcert'] = '/path/to/rootcert' +# praefect['reconciliation_scheduling_interval'] = '5m' +# praefect['reconciliation_histogram_buckets'] = '[0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0]' ################################################################################ # Storage check diff --git a/manifest.json b/manifest.json index 325e843..e1a0747 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "13.3.4~ynh1", + "version": "13.4.0~ynh1", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." @@ -14,7 +14,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.0.8" }, "multi_instance": false, "services": [ diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 53e0692..43645d2 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,35 +1,19 @@ #!/bin/bash -gitlab_version="13.3.4" +gitlab_version="13.4.0" # sha256sum found here: https://packages.gitlab.com/gitlab -gitlab_debian_version="$(lsb_release -sc)" +gitlab_x86_64_buster_source_sha256="029f60fc028033493e2f1027802ad5cd978e09707107f44abe5bd15170bd6a92" -gitlab_x86_64_buster_source_sha256="bf0d2924f10765d08724ea78d8f5ceff4dc4d25d14a5f282aa27d62640f21d23" - -gitlab_arm_buster_source_sha256="ee9b8ac7816dbedf73e319fea4c14ac1c743f06bad4a2597e5753f81789337d1" - -gitlab_x86_64_stretch_source_sha256="bc6800fdd5f91cb18c712ea15e93887141b81658566c780231aa63051cc9fcf0" - -gitlab_arm_stretch_source_sha256="362ab23dfc97814027c428e23900337223d3ae4c1c9220ad35b7ffd341f666cc" +gitlab_arm_buster_source_sha256="592d8346af106d7c274189872a8ee46c7225c9f6b8a731990715264e9edb776a" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) if [ "$architecture" = "x86-64" ]; then - if [ "$gitlab_debian_version" = "buster" ] - then - gitlab_source_sha256=$gitlab_x86_64_buster_source_sha256 - else - gitlab_source_sha256=$gitlab_x86_64_stretch_source_sha256 - fi + gitlab_source_sha256=$gitlab_x86_64_buster_source_sha256 elif [ "$architecture" = "arm" ]; then - if [ "$gitlab_debian_version" = "buster" ] - then - gitlab_source_sha256=$gitlab_arm_buster_source_sha256 - else - gitlab_source_sha256=$gitlab_arm_stretch_source_sha256 - fi + gitlab_source_sha256=$gitlab_arm_buster_source_sha256 fi gitlab_filename="gitlab-ce-${gitlab_version}.deb" diff --git a/upgrade-versions.sh b/upgrade-versions.sh index ab630de..235502f 100755 --- a/upgrade-versions.sh +++ b/upgrade-versions.sh @@ -15,30 +15,24 @@ gitlab_directory="$( cd "$( dirname "$current_dir/$1" )/../../" >/dev/null 2>&1 sed -i -e "s/gitlab_version=\"[^0-9.]*[0-9.]*[0-9.]\"/gitlab_version=\"$version\"/" $gitlab_directory/scripts/upgrade.d/$file # x86_64 -for debian_version in "stretch" "buster" -do - url=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/$debian_version/gitlab-ce_$version-ce.0_amd64.deb +url=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/buster/gitlab-ce_$version-ce.0_amd64.deb - new_sha256=$(curl -s $url | sed -n '/SHA256$/,/<\/tr>$/{ /SHA256$/d; /<\/tr>$/d; p; }' | cut -d$'\n' -f3 | xargs) +new_sha256=$(curl -s $url | sed -n '/SHA256$/,/<\/tr>$/{ /SHA256$/d; /<\/tr>$/d; p; }' | cut -d$'\n' -f3 | xargs) - echo url: $url - echo sha256: $new_sha256 +echo url: $url +echo sha256: $new_sha256 - sed -i -e "s/gitlab_x86_64_${debian_version}_source_sha256=\".*\"/gitlab_x86_64_${debian_version}_source_sha256=\"$new_sha256\"/" $gitlab_directory/scripts/upgrade.d/$file -done +sed -i -e "s/gitlab_x86_64_buster_source_sha256=\".*\"/gitlab_x86_64_buster_source_sha256=\"$new_sha256\"/" $gitlab_directory/scripts/upgrade.d/$file # arm -for debian_version in "stretch" "buster" -do - url=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/$debian_version/gitlab-ce_$version-ce.0_armhf.deb +url=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/buster/gitlab-ce_$version-ce.0_armhf.deb - new_sha256=$(curl -s $url | sed -n '/SHA256$/,/<\/tr>$/{ /SHA256$/d; /<\/tr>$/d; p; }' | cut -d$'\n' -f3 | xargs) +new_sha256=$(curl -s $url | sed -n '/SHA256$/,/<\/tr>$/{ /SHA256$/d; /<\/tr>$/d; p; }' | cut -d$'\n' -f3 | xargs) - echo url: $url - echo sha256: $new_sha256 +echo url: $url +echo sha256: $new_sha256 - sed -i -e "s/gitlab_arm_${debian_version}_source_sha256=\".*\"/gitlab_arm_${debian_version}_source_sha256=\"$new_sha256\"/" $gitlab_directory/scripts/upgrade.d/$file -done +sed -i -e "s/gitlab_arm_buster_source_sha256=\".*\"/gitlab_arm_buster_source_sha256=\"$new_sha256\"/" $gitlab_directory/scripts/upgrade.d/$file if [[ "$(basename $file)" == upgrade.last.sh ]]; then # Update manifest From b2ad152eb44e4aeb52c7afe75261a6b4169cb77b Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 24 Sep 2020 13:25:13 +0200 Subject: [PATCH 60/75] remove debian version variable --- conf/arm.src.default | 2 +- conf/x86-64.src.default | 2 +- scripts/install | 1 - scripts/restore | 1 - scripts/upgrade | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/conf/arm.src.default b/conf/arm.src.default index f6fd120..2c535be 100644 --- a/conf/arm.src.default +++ b/conf/arm.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/buster/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/conf/x86-64.src.default b/conf/x86-64.src.default index b33624e..cf7aba5 100644 --- a/conf/x86-64.src.default +++ b/conf/x86-64.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/buster/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/scripts/install b/scripts/install index fcf86b9..f8da9a8 100644 --- a/scripts/install +++ b/scripts/install @@ -183,7 +183,6 @@ source ./upgrade.d/upgrade.last.sh cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" -ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/restore b/scripts/restore index 235d58e..bdbfbdd 100644 --- a/scripts/restore +++ b/scripts/restore @@ -103,7 +103,6 @@ mkdir -p ../conf/ cp ../settings/conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" -ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/upgrade b/scripts/upgrade index 39cb226..53fc901 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -269,7 +269,6 @@ then cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" From 9e33457e7a3559fa485cc663285e51c52e95516f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 26 Sep 2020 09:13:37 +0200 Subject: [PATCH 61/75] Update manifest.json Small typos --- manifest.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index e1a0747..4a4e46b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name": "Gitlab", + "name": "GitLab", "id": "gitlab", "packaging_format": 1, "version": "13.4.0~ynh1", @@ -26,8 +26,8 @@ "name": "domain", "type": "domain", "ask": { - "en": "Choose a domain name for gitlab", - "fr": "Choisissez un nom de domaine pour gitlab" + "en": "Choose a domain name for GitLab", + "fr": "Choisissez un nom de domaine pour GitLab" }, "example": "example.com" }, @@ -35,8 +35,8 @@ "name": "path", "type": "path", "ask": { - "en": "Choose a path for gitlab", - "fr": "Choisissez un chemin pour gitlab" + "en": "Choose a path for GitLab", + "fr": "Choisissez un chemin pour GitLab" }, "example": "/gitlab", "default": "/gitlab" @@ -63,8 +63,8 @@ "name": "use_web_account", "type": "boolean", "ask": { - "en": "Allow account creation via the gitlab web interface?", - "fr": "Autoriser la création de compte via l'interface web de gitlab ?" + "en": "Authorize account creation from GitLab web interface", + "fr": "Autoriser la création de compte depuis l'interface web de GitLab ?" }, "default": false } From 4d48afe7f7413b2a90b1d50a9c7e7785a1a7e9aa Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 12 Oct 2020 11:40:29 +0200 Subject: [PATCH 62/75] 13.4.3 --- README.md | 2 +- README_fr.md | 2 +- conf/gitlab.rb | 1 + manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fc1f0b0..7c756e9 100644 --- a/README.md +++ b/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.4.0 +**Shipped version:** 13.4.3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 15c0257..48bfc31 100644 --- a/README_fr.md +++ b/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.4.0 +**Version incluse :** 13.4.3 ## Captures d'écran diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 09bc780..cebc64c 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -160,6 +160,7 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['pages_domain_verification_cron_worker'] = "*/15 * * * *" # gitlab_rails['pages_domain_ssl_renewal_cron_worker'] = "*/10 * * * *" # gitlab_rails['pages_domain_removal_cron_worker'] = "47 0 * * *" +# gitlab_rails['remove_unaccepted_member_invites_cron_worker'] = "10 15 * * *" # gitlab_rails['schedule_migrate_external_diffs_worker_cron'] = "15 * * * *" # gitlab_rails['ci_platform_metrics_update_cron_worker'] = '47 9 * * *' # gitlab_rails['analytics_instance_statistics_count_job_trigger_worker_cron'] = "50 23 */1 * *" diff --git a/manifest.json b/manifest.json index 4a4e46b..ad48bc3 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "13.4.0~ynh1", + "version": "13.4.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 43645d2..b291b0f 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,12 +1,12 @@ #!/bin/bash -gitlab_version="13.4.0" +gitlab_version="13.4.3" # sha256sum found here: https://packages.gitlab.com/gitlab -gitlab_x86_64_buster_source_sha256="029f60fc028033493e2f1027802ad5cd978e09707107f44abe5bd15170bd6a92" +gitlab_x86_64_buster_source_sha256="48eea5c92611f695eeacaea6c5cc3f0120465d02f26d03873512fcea7b5f6860" -gitlab_arm_buster_source_sha256="592d8346af106d7c274189872a8ee46c7225c9f6b8a731990715264e9edb776a" +gitlab_arm_buster_source_sha256="b8fd6c7b62872f97c4f943aa085ce8d6f952c5dbdadc0f2e90a11f44d6e3b4a0" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From a8dde1600e92c9dcb709f02f879eb80ac8ba7626 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 12 Oct 2020 19:50:47 +0200 Subject: [PATCH 63/75] fix package_check --- conf/arm.src.default | 2 +- conf/x86-64.src.default | 2 +- scripts/install | 1 + scripts/restore | 1 + scripts/upgrade | 1 + scripts/upgrade.d/upgrade.last.sh | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conf/arm.src.default b/conf/arm.src.default index 2c535be..f6fd120 100644 --- a/conf/arm.src.default +++ b/conf/arm.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/buster/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_armhf.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/conf/x86-64.src.default b/conf/x86-64.src.default index cf7aba5..b33624e 100644 --- a/conf/x86-64.src.default +++ b/conf/x86-64.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/buster/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/__DEBIAN_VERSION__/gitlab-ce___VERSION__-ce.0_amd64.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/scripts/install b/scripts/install index f8da9a8..fcf86b9 100644 --- a/scripts/install +++ b/scripts/install @@ -183,6 +183,7 @@ source ./upgrade.d/upgrade.last.sh cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" +ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/restore b/scripts/restore index bdbfbdd..235d58e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -103,6 +103,7 @@ mkdir -p ../conf/ cp ../settings/conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" +ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/upgrade b/scripts/upgrade index 53fc901..39cb226 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -269,6 +269,7 @@ then cp ../conf/$architecture.src.default ../conf/$architecture.src ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_filename" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__DEBIAN_VERSION__" --replace_string="$gitlab_debian_version" --target_file="../conf/$architecture.src" ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_source_sha256" --target_file="../conf/$architecture.src" tempdir="$(mktemp -d)" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index b291b0f..31feb59 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -3,6 +3,7 @@ gitlab_version="13.4.3" # sha256sum found here: https://packages.gitlab.com/gitlab +gitlab_debian_version="buster" gitlab_x86_64_buster_source_sha256="48eea5c92611f695eeacaea6c5cc3f0120465d02f26d03873512fcea7b5f6860" From 0109c9cf33fa2f009b22f2b8702d43c42a242b71 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 23 Oct 2020 09:23:12 +0200 Subject: [PATCH 64/75] 13.5.0 --- README.md | 2 +- README_fr.md | 2 +- conf/gitlab.rb | 135 +++++++++++++++++++++++------- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +- 5 files changed, 113 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 7c756e9..0420673 100644 --- a/README.md +++ b/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.4.3 +**Shipped version:** 13.5.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 48bfc31..5653629 100644 --- a/README_fr.md +++ b/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.4.3 +**Version incluse :** 13.5.0 ## Captures d'écran diff --git a/conf/gitlab.rb b/conf/gitlab.rb index cebc64c..8fbce3a 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -90,8 +90,26 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! By default, we'll allow 95% of the the worker timeout # gitlab_rails['max_request_duration_seconds'] = 57 +### GitLab email server settings +###! Docs: https://docs.gitlab.com/omnibus/settings/smtp.html +###! **Use smtp instead of sendmail/postfix.** + +# gitlab_rails['smtp_enable'] = true +# gitlab_rails['smtp_address'] = "smtp.server" +# gitlab_rails['smtp_port'] = 465 +# gitlab_rails['smtp_user_name'] = "smtp user" +# gitlab_rails['smtp_password'] = "smtp password" +# gitlab_rails['smtp_domain'] = "example.com" +# gitlab_rails['smtp_authentication'] = "login" +# gitlab_rails['smtp_enable_starttls_auto'] = true +# gitlab_rails['smtp_tls'] = false + ### Email Settings + # gitlab_rails['gitlab_email_enabled'] = true + +##! If your SMTP server does not like the default 'From: gitlab@gitlab.example.com' +##! can change the 'From' with this setting. # gitlab_rails['gitlab_email_from'] = 'example@example.com' # gitlab_rails['gitlab_email_display_name'] = 'Example' # gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com' @@ -164,6 +182,7 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['schedule_migrate_external_diffs_worker_cron'] = "15 * * * *" # gitlab_rails['ci_platform_metrics_update_cron_worker'] = '47 9 * * *' # gitlab_rails['analytics_instance_statistics_count_job_trigger_worker_cron'] = "50 23 */1 * *" +# gitlab_rails['member_invitation_reminder_emails_worker_cron'] = "0 0 * * *" ### Webhook Settings ###! Number of seconds to wait for HTTP response after sending webhook HTTP POST @@ -276,17 +295,17 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! ###! 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']['storage_options'] = {} -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 +# gitlab_rails['object_store']['enabled'] = false +# gitlab_rails['object_store']['connection'] = {} +# gitlab_rails['object_store']['storage_options'] = {} +# 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 @@ -390,6 +409,21 @@ gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = nil # # '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" +# gitlab_rails['pages_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' +# } + ### Impersonation settings # gitlab_rails['impersonation_enabled'] = true @@ -506,6 +540,13 @@ EOS # } # ] +### FortiAuthenticator authentication settings +# gitlab_rails['forti_authenticator_enabled'] = false +# gitlab_rails['forti_authenticator_host'] = 'forti_authenticator.example.com' +# gitlab_rails['forti_authenticator_port'] = 443 +# gitlab_rails['forti_authenticator_username'] = 'admin' +# gitlab_rails['forti_authenticator_access_token'] = 's3cr3t' + ### Backup Settings ###! Docs: https://docs.gitlab.com/omnibus/settings/backups.html @@ -687,20 +728,6 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['redis_actioncable_instance'] = nil # gitlab_rails['redis_actioncable_sentinels'] = nil -### GitLab email server settings -###! Docs: https://docs.gitlab.com/omnibus/settings/smtp.html -###! **Use smtp instead of sendmail/postfix.** - -# gitlab_rails['smtp_enable'] = true -# gitlab_rails['smtp_address'] = "smtp.server" -# gitlab_rails['smtp_port'] = 465 -# gitlab_rails['smtp_user_name'] = "smtp user" -# gitlab_rails['smtp_password'] = "smtp password" -# gitlab_rails['smtp_domain'] = "example.com" -# gitlab_rails['smtp_authentication'] = "login" -# gitlab_rails['smtp_enable_starttls_auto'] = true -# gitlab_rails['smtp_tls'] = false - ###! **Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'** ###! Docs: http://api.rubyonrails.org/classes/ActionMailer/Base.html # gitlab_rails['smtp_openssl_verify_mode'] = 'none' @@ -812,7 +839,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_workhorse['ha'] = false # gitlab_workhorse['listen_network'] = "unix" # gitlab_workhorse['listen_umask'] = 000 -# gitlab_workhorse['listen_addr'] = "/var/opt/gitlab/gitlab-workhorse/socket" +# gitlab_workhorse['listen_addr'] = "/var/opt/gitlab/gitlab-workhorse/sockets/socket" # gitlab_workhorse['auth_backend'] = "http://localhost:8080" ##! the empty string is the default in gitlab-workhorse option parser @@ -1060,10 +1087,17 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # postgresql['ssl_key_file'] = 'server.key' # postgresql['ssl_ca_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' # postgresql['ssl_crl_file'] = nil +# postgresql['cert_auth_addresses'] = { +# 'ADDRESS' => { +# database: 'gitlabhq_production', +# user: 'gitlab' +# } +# } ### Replication settings ###! Note, some replication settings do not require a full restart. They are documented below. # postgresql['wal_level'] = "hot_standby" +# postgresql['wal_log_hints'] = 'off' # postgresql['max_wal_senders'] = 5 # postgresql['max_replication_slots'] = 0 # postgresql['max_locks_per_transaction'] = 128 @@ -1567,6 +1601,38 @@ nginx['listen_https'] = false # gitlab_ci['gitlab_ci_add_pusher'] = true # gitlab_ci['builds_directory'] = '/var/opt/gitlab/gitlab-ci/builds' +################################################################################ +## GitLab Kubernetes Agent Server +##! Docs: https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/blob/master/README.md +################################################################################ + +##! Enable GitLab KAS +# gitlab_kas['enable'] = true + +##! Agent configuration for GitLab KAS +# gitlab_kas['agent_configuration_poll_period'] = 20 +# gitlab_kas['agent_gitops_poll_period'] = 20 +# gitlab_kas['agent_gitops_project_info_cache_ttl'] = 300 +# gitlab_kas['agent_gitops_project_info_cache_error_ttl'] = 60 +# gitlab_kas['agent_info_cache_ttl'] = 300 +# gitlab_kas['agent_info_cache_error_ttl'] = 60 + +##! Shared secret used for authentication between KAS and GitLab +# gitlab_kas['api_secret_key'] = nil # Will be generated if not set. Base64 encoded and exactly 32 bytes long. + +##! Listen configuration for GitLab KAS +# gitlab_kas['listen_address'] = 'localhost:8150' +# gitlab_kas['listen_network'] = 'tcp' +# gitlab_kas['listen_websocket'] = true + +##! Metrics configuration for GitLab KAS +# gitlab_kas['metrics_usage_reporting_period'] = 60 + +##! Directories for GitLab KAS +# gitlab_kas['dir'] = '/var/opt/gitlab/gitlab-kas' +# gitlab_kas['log_directory'] = '/var/log/gitlab/gitlab-kas' +# gitlab_kas['env_directory'] = '/opt/gitlab/etc/gitlab-kas/env' + ################################################################################ ## GitLab Mattermost ##! Docs: https://docs.gitlab.com/omnibus/gitlab-mattermost @@ -1969,6 +2035,11 @@ nginx['listen_https'] = false # 'max_per_repo' => 5 # } # ] +# +# gitaly['daily_maintenance_start_hour'] = 22 +# gitaly['daily_maintenance_start_minute'] = 30 +# gitaly['daily_maintenance_duration'] = '30m' +# gitaly['daily_maintenance_storages'] = ["default"] ################################################################################ ## Praefect @@ -2023,8 +2094,8 @@ 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_host'] = 'postgres.external' +# praefect['database_port'] = 6432 # praefect['database_user'] = 'praefect' # praefect['database_password'] = 'secret' # praefect['database_dbname'] = 'praefect_production' @@ -2034,6 +2105,8 @@ nginx['listen_https'] = false # praefect['database_sslrootcert'] = '/path/to/rootcert' # praefect['reconciliation_scheduling_interval'] = '5m' # praefect['reconciliation_histogram_buckets'] = '[0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0]' +# praefect['database_host_no_proxy'] = 'postgres.internal' +# praefect['database_port_no_proxy'] = 5432 ################################################################################ # Storage check @@ -2101,6 +2174,7 @@ nginx['listen_https'] = false # gitlab_rails['kerberos_enabled'] = true # gitlab_rails['kerberos_keytab'] = /etc/http.keytab # gitlab_rails['kerberos_service_principal_name'] = HTTP/gitlab.example.com@EXAMPLE.COM +# gitlab_rails['kerberos_simple_ldap_linking_allowed_realms'] = ['example.com','kerberos.example.com'] # gitlab_rails['kerberos_use_dedicated_port'] = true # gitlab_rails['kerberos_port'] = 8443 # gitlab_rails['kerberos_https'] = true @@ -2485,6 +2559,11 @@ nginx['listen_https'] = false # patroni['use_pg_rewind'] = false # patroni['use_slots'] = true +## Permanent replication slots for Streaming Replication +# patroni['replication_slots'] = { +# 'geo_secondary' => { 'type' => 'physical' } +# } + ## The address and port that Patroni API binds to and listens on. # patroni['listen_address'] = nil # patroni['port'] = '8008' diff --git a/manifest.json b/manifest.json index ad48bc3..34bd3bc 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "13.4.3~ynh1", + "version": "13.5.0~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 31feb59..fe95f1f 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,13 +1,13 @@ #!/bin/bash -gitlab_version="13.4.3" +gitlab_version="13.5.0" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="buster" -gitlab_x86_64_buster_source_sha256="48eea5c92611f695eeacaea6c5cc3f0120465d02f26d03873512fcea7b5f6860" +gitlab_x86_64_buster_source_sha256="eb0bfe58536cd8f11a464ed38d7ec9f34c420b594e6e2d026f07958e9a77be64" -gitlab_arm_buster_source_sha256="b8fd6c7b62872f97c4f943aa085ce8d6f952c5dbdadc0f2e90a11f44d6e3b4a0" +gitlab_arm_buster_source_sha256="aeff3747d9f399a95e35b4434db9e53122923f630465bf2d769c487a0863700c" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From 6be778efcb6cd299c9913bff5846e9354534f909 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 26 Oct 2020 11:37:11 +0100 Subject: [PATCH 65/75] 13.5.1 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0420673..a310d1f 100644 --- a/README.md +++ b/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.5.0 +**Shipped version:** 13.5.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 5653629..b414616 100644 --- a/README_fr.md +++ b/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.5.0 +**Version incluse :** 13.5.1 ## Captures d'écran diff --git a/manifest.json b/manifest.json index 34bd3bc..2082cc8 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "13.5.0~ynh1", + "version": "13.5.1~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 fe95f1f..d357b25 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,13 +1,13 @@ #!/bin/bash -gitlab_version="13.5.0" +gitlab_version="13.5.1" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="buster" -gitlab_x86_64_buster_source_sha256="eb0bfe58536cd8f11a464ed38d7ec9f34c420b594e6e2d026f07958e9a77be64" +gitlab_x86_64_buster_source_sha256="d39e10faf5c7b88618e56d2dfcbcd5467c125d1bb346be0182a97169b2bc2f75" -gitlab_arm_buster_source_sha256="aeff3747d9f399a95e35b4434db9e53122923f630465bf2d769c487a0863700c" +gitlab_arm_buster_source_sha256="fbf872c3421767b3b268f34477212e6209b28e614ae4ed8900f121765a3a0264" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From 047dba5f15df6ce8d11a3d1f2785afbb3f340a51 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 5 Nov 2020 10:40:17 +0100 Subject: [PATCH 66/75] 13.5.3 --- README.md | 2 +- README_fr.md | 2 +- conf/gitlab.rb | 2 ++ manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a310d1f..379f125 100644 --- a/README.md +++ b/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.5.1 +**Shipped version:** 13.5.3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index b414616..24a8646 100644 --- a/README_fr.md +++ b/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.5.1 +**Version incluse :** 13.5.3 ## Captures d'écran diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 8fbce3a..17f7edd 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -949,6 +949,8 @@ puma['max_threads'] = __PUMA_MAX_THREADS__ # puma['listen'] = '127.0.0.1' puma['port'] = __PUMA_PORT__ # puma['socket'] = '/var/opt/gitlab/gitlab-rails/sockets/gitlab.socket' +# puma['somaxconn'] = 1024 + # puma['pidfile'] = '/opt/gitlab/var/puma/puma.pid' # puma['state_path'] = '/opt/gitlab/var/puma/puma.state' diff --git a/manifest.json b/manifest.json index 2082cc8..af449e2 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "13.5.1~ynh1", + "version": "13.5.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 d357b25..3aa30a2 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,13 +1,13 @@ #!/bin/bash -gitlab_version="13.5.1" +gitlab_version="13.5.3" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="buster" -gitlab_x86_64_buster_source_sha256="d39e10faf5c7b88618e56d2dfcbcd5467c125d1bb346be0182a97169b2bc2f75" +gitlab_x86_64_buster_source_sha256="48549c307d92ad6f09e7f57910a8ee89a9a9e81cfa179671b5f4e89030b612f3" -gitlab_arm_buster_source_sha256="fbf872c3421767b3b268f34477212e6209b28e614ae4ed8900f121765a3a0264" +gitlab_arm_buster_source_sha256="0fdf8470fbcd2b92bda377e0485df9d38149568cb79a0b35065ff8069df05cf9" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From 10cc98b33461b318273c6645fa48b3364f4ac45d Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 24 Nov 2020 22:35:34 +0100 Subject: [PATCH 67/75] 13.6.1 --- README.md | 2 +- README_fr.md | 2 +- conf/gitlab.rb | 89 +++++++++++++++++++++---------- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +-- 5 files changed, 66 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 379f125..5bb3034 100644 --- a/README.md +++ b/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.5.3 +**Shipped version:** 13.6.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 24a8646..7bb9bf2 100644 --- a/README_fr.md +++ b/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.5.3 +**Version incluse :** 13.6.1 ## Captures d'écran diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 17f7edd..62897f9 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -104,6 +104,13 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['smtp_enable_starttls_auto'] = true # gitlab_rails['smtp_tls'] = false +###! **Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'** +###! Docs: http://api.rubyonrails.org/classes/ActionMailer/Base.html +# gitlab_rails['smtp_openssl_verify_mode'] = 'none' + +# gitlab_rails['smtp_ca_path'] = "/etc/ssl/certs" +# gitlab_rails['smtp_ca_file'] = "/etc/ssl/certs/ca-certificates.crt" + ### Email Settings # gitlab_rails['gitlab_email_enabled'] = true @@ -166,7 +173,7 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! Docs: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job ###! https://docs.gitlab.com/ee/ci/yaml/README.html#artifactsexpire_in # gitlab_rails['stuck_ci_jobs_worker_cron'] = "0 0 * * *" -# gitlab_rails['expire_build_artifacts_worker_cron'] = "50 * * * *" +# gitlab_rails['expire_build_artifacts_worker_cron'] = "*/7 * * * *" # gitlab_rails['environments_auto_stop_cron_worker_cron'] = "24 * * * *" # gitlab_rails['pipeline_schedule_worker_cron'] = "19 * * * *" # gitlab_rails['ci_archive_traces_cron_worker_cron'] = "17 * * * *" @@ -372,6 +379,7 @@ external_url '__GENERATED_EXTERNAL_URL__' ### GitLab uploads ###! Docs: https://docs.gitlab.com/ee/administration/uploads.html +# gitlab_rails['uploads_directory'] = "/var/opt/gitlab/gitlab-rails/uploads" # gitlab_rails['uploads_storage_path'] = "/opt/gitlab/embedded/service/gitlab-rails/public" # gitlab_rails['uploads_base_dir'] = "uploads/-/system" # gitlab_rails['uploads_object_store_enabled'] = false @@ -628,6 +636,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ### Extra customization # gitlab_rails['extra_google_analytics_id'] = '_your_tracking_id' +# gitlab_rails['extra_google_tag_manager_id'] = '_your_tracking_id' # gitlab_rails['extra_piwik_url'] = '_your_piwik_url' # gitlab_rails['extra_piwik_site_id'] = '_your_piwik_site_id' @@ -649,9 +658,6 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['dir'] = "/var/opt/gitlab/gitlab-rails" # gitlab_rails['log_directory'] = "/var/log/gitlab/gitlab-rails" -### GitLab application settings -# gitlab_rails['uploads_directory'] = "/var/opt/gitlab/gitlab-rails/uploads" - #### Change the initial default admin password and shared runner registration tokens. ####! **Only applicable on initial setup, changing these settings after database ####! is created and seeded won't yield any change.** @@ -728,13 +734,6 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['redis_actioncable_instance'] = nil # gitlab_rails['redis_actioncable_sentinels'] = nil -###! **Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'** -###! Docs: http://api.rubyonrails.org/classes/ActionMailer/Base.html -# gitlab_rails['smtp_openssl_verify_mode'] = 'none' - -# gitlab_rails['smtp_ca_path'] = "/etc/ssl/certs" -# gitlab_rails['smtp_ca_file'] = "/etc/ssl/certs/ca-certificates.crt" - ################################################################################ ## Container Registry settings ##! Docs: https://docs.gitlab.com/ee/administration/container_registry.html @@ -876,6 +875,16 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/" # } +##! Resource limitations for the dynamic image scaler. +##! Exceeding these thresholds will cause Workhorse to serve images in their original size. +##! +##! Maximum number of scaler processes that are allowed to execute concurrently. +##! It is recommended for this not to exceed the number of CPUs available. +# gitlab_workhorse['image_scaler_max_procs'] = 4 +##! +##! Maximum file size in bytes for an image to be considered eligible for rescaling +# gitlab_workhorse['image_scaler_max_filesize'] = 250000 + ################################################################################ ## GitLab User Settings ##! Modify default git user. @@ -978,7 +987,7 @@ puma['port'] = __PUMA_PORT__ # sidekiq['log_format'] = "json" # sidekiq['shutdown_timeout'] = 4 # sidekiq['cluster'] = true -# sidekiq['experimental_queue_selector'] = false +# sidekiq['queue_selector'] = false # sidekiq['interval'] = nil # sidekiq['max_concurrency'] = 50 # sidekiq['min_concurrency'] = nil @@ -1881,6 +1890,7 @@ nginx['listen_https'] = false # 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/" # } # postgres_exporter['sslmode'] = nil +# postgres_exporter['per_table_stats'] = false ################################################################################ ## Prometheus PgBouncer exporter (EE only) @@ -2022,6 +2032,7 @@ nginx['listen_https'] = false # gitaly['auth_transitioning'] = false # When true, auth is logged to Prometheus but NOT enforced # gitaly['graceful_restart_timeout'] = '1m' # Grace time for a gitaly process to finish ongoing requests # gitaly['git_catfile_cache_size'] = 100 # Number of 'git cat-file' processes kept around for re-use +# gitaly['git_bin_path'] = "/opt/gitlab/embedded/bin/git" # A custom path for the 'git' executable # gitaly['open_files_ulimit'] = 15000 # Maximum number of open files allowed for the gitaly process # gitaly['ruby_max_rss'] = 300000000 # RSS threshold in bytes for triggering a gitaly-ruby restart # gitaly['ruby_graceful_restart_timeout'] = '10m' # Grace time for a gitaly-ruby process to finish ongoing requests @@ -2531,35 +2542,55 @@ nginx['listen_https'] = false # patroni['data_dir'] = '/var/opt/gitlab/patroni/data' # patroni['ctl_command'] = '/opt/gitlab/embedded/bin/patronictl' -# patroni['scope'] = 'gitlab-postgresql-ha' -# patroni['name'] = nil - -# patroni['log_directory'] = '/var/log/gitlab/patroni' -# patroni['log_level'] = 'INFO' - -# patroni['consul']['url'] = 'http://127.0.0.1:8500' -# patroni['consul']['service_check_interval'] = '10s' -# patroni['consul']['register_service'] = false -# patroni['consul']['checks'] = [] - -## Bootstrap settings +## Patroni dynamic configuration settings # patroni['loop_wait'] = 10 # patroni['ttl'] = 30 # patroni['retry_timeout'] = 10 # patroni['maximum_lag_on_failover'] = 1_048_576 # patroni['max_timelines_history'] = 0 # patroni['master_start_timeout'] = 300 +# patroni['use_pg_rewind'] = false +# patroni['use_slots'] = true +# patroni['replication_password'] = nil +# patroni['replication_slots'] = {} + +## Standby cluster replication settings +# patroni['standby_cluster']['enable'] = false +# patroni['standby_cluster']['host'] = nil +# patroni['standby_cluster']['port'] = 5432 +# patroni['standby_cluster']['primary_slot_name'] = nil + +## Global/Universal settings +# patroni['scope'] = 'gitlab-postgresql-ha' +# patroni['name'] = nil + +## Log settings +# patroni['log_directory'] = '/var/log/gitlab/patroni' +# patroni['log_level'] = 'INFO' + +## Consul specific settings +# patroni['consul']['url'] = 'http://127.0.0.1:8500' +# patroni['consul']['service_check_interval'] = '10s' +# patroni['consul']['register_service'] = true +# patroni['consul']['checks'] = [] ## PostgreSQL configuration override -# patroni['postgresql']['wal_level'] = 'replica' # patroni['postgresql']['hot_standby'] = 'on' + +## The following must hold the same values on all nodes. +## Leave unassined to use PostgreSQL's default values. +# patroni['postgresql']['wal_level'] = 'replica' +# patroni['postgresql']['wal_log_hints'] = 'on' +# patroni['postgresql']['max_worker_processes'] = 8 +# patroni['postgresql']['max_locks_per_transaction'] = 64 +# patroni['postgresql']['max_connections'] = 200 +# patroni['postgresql']['checkpoint_timeout'] = 30 + +## The following can hold different values on all nodes. +## Leave unassined to use PostgreSQL's default values. # patroni['postgresql']['wal_keep_segments'] = 8 # patroni['postgresql']['max_wal_senders'] = 5 # patroni['postgresql']['max_replication_slots'] = 5 -# patroni['postgresql']['checkpoint_timeout'] = 30 - -# patroni['use_pg_rewind'] = false -# patroni['use_slots'] = true ## Permanent replication slots for Streaming Replication # patroni['replication_slots'] = { diff --git a/manifest.json b/manifest.json index af449e2..753f92b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "13.5.3~ynh1", + "version": "13.6.1~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 3aa30a2..ab19708 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,13 +1,13 @@ #!/bin/bash -gitlab_version="13.5.3" +gitlab_version="13.6.1" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="buster" -gitlab_x86_64_buster_source_sha256="48549c307d92ad6f09e7f57910a8ee89a9a9e81cfa179671b5f4e89030b612f3" +gitlab_x86_64_buster_source_sha256="307c76442859894874ecca391e27031892d2a000e5a508f367200ffb5a05011c" -gitlab_arm_buster_source_sha256="0fdf8470fbcd2b92bda377e0485df9d38149568cb79a0b35065ff8069df05cf9" +gitlab_arm_buster_source_sha256="904f065a64143976fd9e3e60cdedbb383c4ac60592612d51375ceeff2ddca9bc" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From 4a8e82c719a93e4943b0598ac283c0f3dbdf41c1 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 11 Dec 2020 18:18:16 +0100 Subject: [PATCH 68/75] 13.6.3 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5bb3034..03b5ed0 100644 --- a/README.md +++ b/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.6.1 +**Shipped version:** 13.6.3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 7bb9bf2..b5633c6 100644 --- a/README_fr.md +++ b/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.6.1 +**Version incluse :** 13.6.3 ## Captures d'écran diff --git a/manifest.json b/manifest.json index 753f92b..27782f2 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "13.6.1~ynh1", + "version": "13.6.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 ab19708..9857880 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,13 +1,13 @@ #!/bin/bash -gitlab_version="13.6.1" +gitlab_version="13.6.3" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="buster" -gitlab_x86_64_buster_source_sha256="307c76442859894874ecca391e27031892d2a000e5a508f367200ffb5a05011c" +gitlab_x86_64_buster_source_sha256="1a8092038da1541e8306d0d17e2d744cee8919908f41e37d80f48ad6273cde5c" -gitlab_arm_buster_source_sha256="904f065a64143976fd9e3e60cdedbb383c4ac60592612d51375ceeff2ddca9bc" +gitlab_arm_buster_source_sha256="3d18ce34311a8e19efbc8aec5bb9c58fa7c41558ad0b476685c18e828bf53d6c" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From 40675d8f2c3af929779d1e88e67660f5b0e901d0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Dec 2020 16:58:58 +0100 Subject: [PATCH 69/75] Upgarde to 13.7.0 --- README.md | 4 ++-- README_fr.md | 4 ++-- check_process | 2 -- conf/arm.src.default | 2 +- conf/x86-64.src.default | 2 +- manifest.json | 2 +- scripts/backup | 12 ++++++------ scripts/upgrade | 7 ------- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 9 files changed, 16 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 03b5ed0..5e95c6c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # GitLab for YunoHost [![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) -[![Install GitLab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab) +[![Install GitLab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab) *[Lire ce readme en français.](./README_fr.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.6.3 +**Shipped version:** 13.7.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index b5633c6..746507a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # GitLab pour YunoHost [![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) -[![Installer GitLab pour YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab) +[![Installer GitLab pour YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab) *[Read this readme in english.](./README.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.6.3 +**Version incluse :** 13.7.0 ## Captures d'écran diff --git a/check_process b/check_process index a4705b6..83f543a 100644 --- a/check_process +++ b/check_process @@ -21,8 +21,6 @@ multi_instance=0 port_already_use=1 (8080) change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none diff --git a/conf/arm.src.default b/conf/arm.src.default index f6fd120..9370a8f 100644 --- a/conf/arm.src.default +++ b/conf/arm.src.default @@ -3,4 +3,4 @@ SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ SOURCE_EXTRACT=false -SOURCE_FORMAT=deb \ No newline at end of file +SOURCE_FORMAT=deb diff --git a/conf/x86-64.src.default b/conf/x86-64.src.default index b33624e..f8e3b71 100644 --- a/conf/x86-64.src.default +++ b/conf/x86-64.src.default @@ -3,4 +3,4 @@ SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ SOURCE_EXTRACT=false -SOURCE_FORMAT=deb \ No newline at end of file +SOURCE_FORMAT=deb diff --git a/manifest.json b/manifest.json index 27782f2..e0b1b63 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "13.6.3~ynh1", + "version": "13.7.0~ynh1", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." diff --git a/scripts/backup b/scripts/backup index 32523cb..3f40d60 100644 --- a/scripts/backup +++ b/scripts/backup @@ -24,7 +24,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -32,18 +32,19 @@ config_path=$(ynh_app_setting_get --app=$app --key=config_path) domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Backing up nginx web server configuration..." --weight=1 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP GITLAB DATABASE #================================================= -ynh_script_progression --message="Backuping of Gitlab..." --weight=9 # Use gitlab-backup to backup # For the complete doc: https://docs.gitlab.com/ce/raketasks/backup_restore.html @@ -55,7 +56,6 @@ ynh_backup --src_path="/var/opt/$app/backups/last_gitlab_backup.tar" #================================================= # BACKUP CONF FILES #================================================= -ynh_script_progression --message="Backuping configuration files of Gitlab..." --weight=1 ynh_backup --src_path="$config_path/gitlab-secrets.json" ynh_backup --src_path="$config_path/gitlab.rb" @@ -65,4 +65,4 @@ ynh_backup --src_path="$config_path/gitlab-persistent.rb" # END OF SCRIPT #================================================= -ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/upgrade b/scripts/upgrade index 39cb226..d3decec 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,13 +172,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path $path_url) - #================================================= # STANDARD UPGRADE STEPS #================================================= diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 9857880..81f77dd 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,13 +1,13 @@ #!/bin/bash -gitlab_version="13.6.3" +gitlab_version="13.7.0" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="buster" -gitlab_x86_64_buster_source_sha256="1a8092038da1541e8306d0d17e2d744cee8919908f41e37d80f48ad6273cde5c" +gitlab_x86_64_buster_source_sha256="ae199a8dda08c7bbd7e743fc05e3eaee0ca0b0946deddc19c4bcfa8dc8852ad1" -gitlab_arm_buster_source_sha256="3d18ce34311a8e19efbc8aec5bb9c58fa7c41558ad0b476685c18e828bf53d6c" +gitlab_arm_buster_source_sha256="fc423975c33eb3e43a5fbbcceb4f35afa1f9241108e3ba0233dd384a349b0d89" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From 6cb834add755f6222f044fc17db3cfd2a3d22684 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Dec 2020 17:08:21 +0100 Subject: [PATCH 70/75] Small typos --- README.md | 3 +-- README_fr.md | 3 +-- scripts/change_url | 8 ++++---- scripts/install | 14 +++++++------- scripts/remove | 8 ++++---- scripts/restore | 10 +++++----- scripts/upgrade | 10 +++++----- 7 files changed, 27 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 5e95c6c..eaa3b88 100644 --- a/README.md +++ b/README.md @@ -55,8 +55,7 @@ How to configure GitLab: --- -Developers info ----------------- +## Developers info Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing). diff --git a/README_fr.md b/README_fr.md index 746507a..2663c0a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -55,8 +55,7 @@ Comment configurer GitLab : --- -Informations pour les développeurs ----------------- +## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing). diff --git a/scripts/change_url b/scripts/change_url index 80c4f41..c436ecb 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -55,7 +55,7 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -92,7 +92,7 @@ fi #================================================= # CONFIGURE GITLAB #================================================= -ynh_script_progression --message="Configure gitlab..." --weight=28 +ynh_script_progression --message="Configure GitLab..." --weight=28 ynh_backup_if_checksum_is_different --file="$config_path/gitlab.rb" @@ -125,7 +125,7 @@ gitlab-ctl reconfigure #================================================= # WAITING GITLAB #================================================= -ynh_script_progression --message="Waiting for gitlab..." --weight=15 +ynh_script_progression --message="Waiting for GitLab..." --weight=15 ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on tcp://127.0.0.1:$portPuma" --timeout=300 @@ -134,7 +134,7 @@ ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path= #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --action=reload --service_name=nginx diff --git a/scripts/install b/scripts/install index fcf86b9..13a1bf2 100644 --- a/scripts/install +++ b/scripts/install @@ -148,7 +148,7 @@ fi #================================================= # PRECONFIGURE GITLAB #================================================= -ynh_script_progression --message="Preconfigure gitlab..." --weight=1 +ynh_script_progression --message="Preconfigure GitLab..." --weight=1 mkdir -p $config_path @@ -177,7 +177,7 @@ ynh_store_file_checksum --file="$config_path/gitlab.rb" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=200 +ynh_script_progression --message="Setting up source files..." --weight=50 source ./upgrade.d/upgrade.last.sh cp ../conf/$architecture.src.default ../conf/$architecture.src @@ -199,9 +199,9 @@ fi #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=2 +ynh_script_progression --message="Configuring NGINX web server..." --weight=2 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config client_max_body_size #================================================= @@ -224,7 +224,7 @@ ApplicationSetting.last.update_attributes(password_authentication_enabled_for_we #================================================= # RECONFIGURE TO TAKE INTO ACCOUNT CHANGES #================================================= -ynh_script_progression --message="Reconfigure gitlab..." --weight=13 +ynh_script_progression --message="Reconfigure GitLab..." --weight=13 gitlab-ctl reconfigure @@ -250,14 +250,14 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --action=reload --service_name=nginx #================================================= # RESTART GITLAB #================================================= -ynh_script_progression --message="Restarting gitlab..." --weight=15 +ynh_script_progression --message="Restarting GitLab..." --weight=15 ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on tcp://127.0.0.1:$portPuma" --timeout=300 diff --git a/scripts/remove b/scripts/remove index 4665184..1588b0c 100644 --- a/scripts/remove +++ b/scripts/remove @@ -39,7 +39,7 @@ fi #================================================= # STOP GITLAB #================================================= -ynh_script_progression --message="Stopping gitlab" --weight=8 +ynh_script_progression --message="Stopping GitLab" --weight=8 # I use gitlab-ctl and not ynh_systemd_action or systemctl to stop the service to avoid this error: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/common_installation_problems/README.md#reconfigure-freezes-at-ruby_blocksupervise_redis_sleep-action-run during the reinstall of the app gitlab-ctl stop @@ -47,7 +47,7 @@ gitlab-ctl stop #================================================= # REMOVE GITLAB #================================================= -ynh_script_progression --message="Removing Gitlab" --weight=4 +ynh_script_progression --message="Removing GitLab" --weight=4 dpkg --remove gitlab-ce @@ -71,9 +71,9 @@ ynh_secure_remove --file="$config_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration" --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration" --weight=1 -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= diff --git a/scripts/restore b/scripts/restore index 235d58e..5887b9e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -87,7 +87,7 @@ ynh_add_swap --size=$swap_needed #================================================= # RESTORE CONF FILES #================================================= -ynh_script_progression --message="Restoring configuration files of Gitlab..." --weight=1 +ynh_script_progression --message="Restoring configuration files of GitLab..." --weight=1 ynh_restore_file --origin_path="$config_path/gitlab-secrets.json" ynh_restore_file --origin_path="$config_path/gitlab.rb" @@ -96,7 +96,7 @@ ynh_restore_file --origin_path="$config_path/gitlab-persistent.rb" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Reinstalling gitlab..." --weight=200 +ynh_script_progression --message="Reinstalling GitLab..." --weight=200 source ../settings/scripts/upgrade.d/upgrade.last.sh mkdir -p ../conf/ @@ -121,7 +121,7 @@ fi #================================================= # RESTORE GITLAB DATABASE #================================================= -ynh_script_progression --message="Restoring Gitlab..." --weight=55 +ynh_script_progression --message="Restoring GitLab..." --weight=55 ynh_restore_file --origin_path="/var/opt/$app/backups/last_gitlab_backup.tar" @@ -150,7 +150,7 @@ yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/applica #================================================= # WAITING GITLAB #================================================= -ynh_script_progression --message="Waiting for gitlab..." --weight=14 +ynh_script_progression --message="Waiting for GitLab..." --weight=14 ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on tcp://127.0.0.1:$portPuma" --timeout=300 @@ -163,7 +163,7 @@ gitlab-rake gitlab:check SANITIZE=true #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --action=reload --service_name=nginx diff --git a/scripts/upgrade b/scripts/upgrade index d3decec..aa59d51 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -231,7 +231,7 @@ then fi } - # To update gitlab from major version A to B, we have to go to the last minor version + # To update GitLab from major version A to B, we have to go to the last minor version # of the major version A and then go to the first minor version of the major version B # to finally go to the current minor version of the major version B # A.last -> B.first -> B.last @@ -284,7 +284,7 @@ fi #================================================= # RECONFIGURE GITLAB #================================================= -ynh_script_progression --message="Reconfigure gitlab..." --weight=13 +ynh_script_progression --message="Reconfigure GitLab..." --weight=13 ynh_backup_if_checksum_is_different --file="$config_path/gitlab.rb" @@ -317,7 +317,7 @@ gitlab-ctl reconfigure # Overwrite the nginx configuration only if it's allowed if [ $overwrite_nginx -eq 1 ] then - ynh_script_progression --message="Configuring nginx web server..." --weight=2 + ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated nginx config ynh_add_nginx_config client_max_body_size fi @@ -346,7 +346,7 @@ fi if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Restarting gitlab..." --weight=15 + ynh_script_progression --message="Restarting GitLab..." --weight=15 ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/puma/current" --line_match="Listening on tcp://127.0.0.1:$portPuma" --timeout=300 fi @@ -354,7 +354,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --action=reload --service_name=nginx From acad263795313a5a88fe2866b6de967c62a62691 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Dec 2020 17:14:33 +0100 Subject: [PATCH 71/75] Fix weight --- scripts/restore | 4 ++-- scripts/upgrade | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/restore b/scripts/restore index 5887b9e..4cf1faa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -96,7 +96,7 @@ ynh_restore_file --origin_path="$config_path/gitlab-persistent.rb" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Reinstalling GitLab..." --weight=200 +ynh_script_progression --message="Reinstalling GitLab..." --weight=50 source ../settings/scripts/upgrade.d/upgrade.last.sh mkdir -p ../conf/ @@ -121,7 +121,7 @@ fi #================================================= # RESTORE GITLAB DATABASE #================================================= -ynh_script_progression --message="Restoring GitLab..." --weight=55 +ynh_script_progression --message="Restoring GitLab..." --weight=35 ynh_restore_file --origin_path="/var/opt/$app/backups/last_gitlab_backup.tar" diff --git a/scripts/upgrade b/scripts/upgrade index aa59d51..bec4251 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -209,7 +209,7 @@ ynh_add_swap --size=$swap_needed if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Setting up source files..." --weight=200 + ynh_script_progression --message="Setting up source files..." --weight=50 # To avoid the automatic backup, already performed by YunoHost: https://docs.gitlab.com/omnibus/update/#updating-methods touch $config_path/skip-auto-backup From 7f2a0943c11555933846595c75b17d9358d89bd4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Dec 2020 17:18:58 +0100 Subject: [PATCH 72/75] Small typos --- scripts/change_url | 2 +- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index c436ecb..46334d1 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -142,4 +142,4 @@ ynh_systemd_action --action=reload --service_name=nginx # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression --message="Change of URL completed for GitLab" --last diff --git a/scripts/install b/scripts/install index 13a1bf2..3583c85 100644 --- a/scripts/install +++ b/scripts/install @@ -265,4 +265,4 @@ ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path= # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression --message="Installation of GitLab completed" --last diff --git a/scripts/remove b/scripts/remove index 1588b0c..9f5c60b 100644 --- a/scripts/remove +++ b/scripts/remove @@ -110,4 +110,4 @@ ynh_del_swap # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression --message="Removal of GitLab completed" --last diff --git a/scripts/restore b/scripts/restore index 4cf1faa..294f022 100644 --- a/scripts/restore +++ b/scripts/restore @@ -171,4 +171,4 @@ ynh_systemd_action --action=reload --service_name=nginx # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression --message="Restoration completed for GitLab" --last diff --git a/scripts/upgrade b/scripts/upgrade index bec4251..7cd6573 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -362,4 +362,4 @@ ynh_systemd_action --action=reload --service_name=nginx # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression --message="Upgrade of GitLab completed" --last From 52d31c834c8890c80d020b4dc3af2b5d0a86ab24 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 25 Dec 2020 21:52:55 +0100 Subject: [PATCH 73/75] update gitlab.rb --- conf/gitlab.rb | 47 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 62897f9..fbd5051 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -555,6 +555,11 @@ EOS # gitlab_rails['forti_authenticator_username'] = 'admin' # gitlab_rails['forti_authenticator_access_token'] = 's3cr3t' +### FortiToken Cloud authentication settings +# gitlab_rails['forti_token_cloud_enabled'] = false +# gitlab_rails['forti_token_cloud_client_id'] = 'forti_token_cloud_client_id' +# gitlab_rails['forti_token_cloud_client_secret'] = 's3cr3t' + ### Backup Settings ###! Docs: https://docs.gitlab.com/omnibus/settings/backups.html @@ -637,8 +642,8 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ### Extra customization # gitlab_rails['extra_google_analytics_id'] = '_your_tracking_id' # gitlab_rails['extra_google_tag_manager_id'] = '_your_tracking_id' -# gitlab_rails['extra_piwik_url'] = '_your_piwik_url' -# gitlab_rails['extra_piwik_site_id'] = '_your_piwik_site_id' +# gitlab_rails['extra_matomo_url'] = '_your_matomo_url' +# gitlab_rails['extra_matomo_site_id'] = '_your_matomo_site_id' ##! Docs: https://docs.gitlab.com/omnibus/settings/environment-variables.html # gitlab_rails['env'] = { @@ -696,6 +701,12 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['db_prepared_statements'] = false # gitlab_rails['db_statements_limit'] = 1000 # gitlab_rails['db_connect_timeout'] = nil +# gitlab_rails['db_keepalives'] = nil +# gitlab_rails['db_keepalives_idle'] = nil +# gitlab_rails['db_keepalives_interval'] = nil +# gitlab_rails['db_keepalives_count'] = nil +# gitlab_rails['db_tcp_user_timeout'] = nil +# gitlab_rails['db_application_name'] = nil ### GitLab Redis settings @@ -1513,6 +1524,9 @@ nginx['listen_https'] = false ##! Configure to expose GitLab Pages on external IP address, serving the HTTPS # gitlab_pages['external_https'] = [] +##! Configure to expose GitLab Pages on external IP address, serving the HTTPS over PROXYv2 +# gitlab_pages['external_https_proxyv2'] = [] + ##! Configure to use the default list of cipher suites # gitlab_pages['insecure_ciphers'] = false @@ -1583,6 +1597,19 @@ nginx['listen_https'] = false ##! Shared secret used for authentication between Pages and GitLab # gitlab_pages['api_secret_key'] = nil # Will be generated if not set. Base64 encoded and exactly 32 bytes long. +##! Advanced settings for serving GitLab Pages from zip archives. +##! The recommended default values are set inside GitLab Pages. +##! Should be changed only if absolutely needed. + +##! The maximum time an archive will be cached in memory. +# gitlab_pages['zip_cache_expiration'] = "60s" +##! Zip archive cache cleaning interval. +# gitlab_pages['zip_cache_cleanup'] = "30s" +##! The interval to refresh a cache archive if accessed before expiring. +# gitlab_pages['zip_cache_refresh'] = "30s" +##! The maximum amount of time it takes to open a zip archive from the file system or object storage. +# gitlab_pages['zip_open_timeout'] = "30s" + # gitlab_pages['env_directory'] = "/opt/gitlab/etc/gitlab-pages/env" # gitlab_pages['env'] = { # 'SSL_CERT_DIR' => "#{node['package']['install-dir']}/embedded/ssl/certs/" @@ -2053,6 +2080,13 @@ nginx['listen_https'] = false # gitaly['daily_maintenance_start_minute'] = 30 # gitaly['daily_maintenance_duration'] = '30m' # gitaly['daily_maintenance_storages'] = ["default"] +# gitaly['cgroups_count'] = 10 +# gitaly['cgroups_mountpoint'] = '/sys/fs/cgroup' +# gitaly['cgroups_hierarchy_root'] = 'gitaly' +# gitaly['cgroups_memory_enabled'] = true +# gitaly['cgroups_memory_limit'] = 1048576 +# gitaly['cgroups_cpu_enabled'] = true +# gitaly['cgroups_cpu_shares'] = 512 ################################################################################ ## Praefect @@ -2178,6 +2212,7 @@ nginx['listen_https'] = false # gitlab_rails['historical_data_worker_cron'] = "0 12 * * *" # gitlab_rails['pseudonymizer_worker_cron'] = "0 23 * * *" # gitlab_rails['elastic_index_bulk_cron'] = "*/1 * * * *" +# gitlab_rails['analytics_devops_adoption_create_all_snapshots_worker_cron'] = "0 0 1 * *" ################################################################################ ## Kerberos (EE Only) @@ -2217,8 +2252,8 @@ nginx['listen_https'] = false # } ################################################################################ -## Dependency proxy (EE Only) -##! Docs: https://docs.gitlab.com/ee/administration/dependency_proxy.md +## Dependency proxy +##! Docs: https://docs.gitlab.com/ee/administration/packages/dependency_proxy.html ################################################################################ # gitlab_rails['dependency_proxy_enabled'] = true @@ -2549,7 +2584,9 @@ nginx['listen_https'] = false # patroni['maximum_lag_on_failover'] = 1_048_576 # patroni['max_timelines_history'] = 0 # patroni['master_start_timeout'] = 300 -# patroni['use_pg_rewind'] = false +# patroni['use_pg_rewind'] = true +# patroni['remove_data_directory_on_rewind_failure'] = false +# patroni['remove_data_directory_on_diverged_timelines'] = false # patroni['use_slots'] = true # patroni['replication_password'] = nil # patroni['replication_slots'] = {} From bc56071f0fad836c24fff1fe960208b866e94961 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 15 Jan 2021 11:36:43 +0100 Subject: [PATCH 74/75] 13.7.4 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index eaa3b88..3efe09d 100644 --- a/README.md +++ b/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.7.0 +**Shipped version:** 13.7.4 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 2663c0a..f02402b 100644 --- a/README_fr.md +++ b/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.7.0 +**Version incluse :** 13.7.4 ## Captures d'écran diff --git a/manifest.json b/manifest.json index e0b1b63..86f2afa 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "13.7.0~ynh1", + "version": "13.7.4~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 81f77dd..b0fdce2 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,13 +1,13 @@ #!/bin/bash -gitlab_version="13.7.0" +gitlab_version="13.7.4" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="buster" -gitlab_x86_64_buster_source_sha256="ae199a8dda08c7bbd7e743fc05e3eaee0ca0b0946deddc19c4bcfa8dc8852ad1" +gitlab_x86_64_buster_source_sha256="73341390775bdece7e084b7c76833338e9c00a26e849ac483db74dd279bcf9b0" -gitlab_arm_buster_source_sha256="fc423975c33eb3e43a5fbbcceb4f35afa1f9241108e3ba0233dd384a349b0d89" +gitlab_arm_buster_source_sha256="21070aa0f991ec88f4149765ce1273c6a44cb8c3a91f301e27b3142235f75394" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From 7682c120365e3fb254beebf2876dfd114237f622 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 19 Jan 2021 01:05:34 +0100 Subject: [PATCH 75/75] Update nginx config --- conf/nginx.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 21d6e44..dd9067e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,5 @@ location __PATH__/ { - # Adapted from https://gitlab.com/gitlab-org/gitlab-recipes/blob/master/web-server/nginx/gitlab-omnibus-ssl-nginx.conf + # Adapted from https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/lib/support/nginx/gitlab-ssl client_max_body_size __CLIENT_MAX_BODY_SIZE__; gzip off; @@ -19,6 +19,8 @@ location __PATH__/ { proxy_set_header X-Forwarded-Ssl on; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc;