From 5be4369b61c3e58e988ccd21ac4d4357e26bfeda Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 27 Oct 2023 11:39:33 +0200 Subject: [PATCH 1/4] 16.5.0 --- conf/gitlab.rb | 65 ++++++++++++++++++++++++++++--- manifest.toml | 2 +- scripts/upgrade.d/upgrade.last.sh | 18 ++++----- 3 files changed, 69 insertions(+), 16 deletions(-) diff --git a/conf/gitlab.rb b/conf/gitlab.rb index aa24c3f..3f2be1c 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -461,7 +461,7 @@ external_url '__GENERATED_EXTERNAL_URL__' # } ### CI Secure Files -# gitlab_rails['ci_secure_files_enabled'] = false +# gitlab_rails['ci_secure_files_enabled'] = true # gitlab_rails['ci_secure_files_storage_path'] = "/var/opt/gitlab/gitlab-rails/shared/ci_secure_files" # gitlab_rails['ci_secure_files_object_store_enabled'] = false # gitlab_rails['ci_secure_files_object_store_remote_directory'] = "ci-secure-files" @@ -646,7 +646,7 @@ EOS # gitlab_rails['backup_path'] = "/var/opt/gitlab/backups" # gitlab_rails['backup_gitaly_backup_path'] = "/opt/gitlab/embedded/bin/gitaly-backup" -###! Docs: https://docs.gitlab.com/ee/raketasks/backup_restore.html#backup-archive-permissions +###! Docs: https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#backup-archive-permissions # gitlab_rails['backup_archive_permissions'] = 0644 # gitlab_rails['backup_pg_schema'] = 'public' @@ -684,7 +684,7 @@ EOS # gitlab_rails['backup_storage_class'] = 'STANDARD' ###! Skip parts of the backup. Comma separated. -###! Docs: https://docs.gitlab.com/ee/raketasks/backup_restore.html#excluding-specific-directories-from-the-backup +###! Docs: https://docs.gitlab.com/ee/administration/backup_restore/backup_gitlab.html#excluding-specific-directories-from-the-backup #gitlab_rails['env'] = { # "SKIP" => "db,uploads,repositories,builds,artifacts,lfs,registry,pages" #} @@ -816,6 +816,10 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['redis_password'] = nil # gitlab_rails['redis_database'] = 0 # gitlab_rails['redis_enable_client'] = true +# gitlab_rails['redis_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/' +# gitlab_rails['redis_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' +# gitlab_rails['redis_tls_client_cert_file'] = nil +# gitlab_rails['redis_tls_client_key_file'] = nil #### Redis local UNIX socket (will be disabled if TCP method is used) # gitlab_rails['redis_socket'] = "/var/opt/gitlab/redis/redis.socket" @@ -850,60 +854,100 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['redis_cache_username'] = nil # gitlab_rails['redis_cache_password'] = nil # gitlab_rails['redis_cache_cluster_nodes'] = nil +# gitlab_rails['redis_cache_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/' +# gitlab_rails['redis_cache_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' +# gitlab_rails['redis_cache_tls_client_cert_file'] = nil +# gitlab_rails['redis_cache_tls_client_key_file'] = nil # gitlab_rails['redis_queues_instance'] = nil # gitlab_rails['redis_queues_sentinels'] = nil # gitlab_rails['redis_queues_sentinels_password'] = nil # gitlab_rails['redis_queues_username'] = nil # gitlab_rails['redis_queues_password'] = nil # gitlab_rails['redis_queues_cluster_nodes'] = nil +# gitlab_rails['redis_queues_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/' +# gitlab_rails['redis_queues_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' +# gitlab_rails['redis_queues_tls_client_cert_file'] = nil +# gitlab_rails['redis_queues_tls_client_key_file'] = nil # gitlab_rails['redis_shared_state_instance'] = nil # gitlab_rails['redis_shared_state_sentinels'] = nil # gitlab_rails['redis_shared_state_sentinels_password'] = nil # gitlab_rails['redis_shared_state_username'] = nil # gitlab_rails['redis_shared_state_password'] = nil # gitlab_rails['redis_shared_state_cluster_nodes'] = nil +# gitlab_rails['redis_shared_state_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/' +# gitlab_rails['redis_shared_state_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' +# gitlab_rails['redis_shared_state_tls_client_cert_file'] = nil +# gitlab_rails['redis_shared_state_tls_client_key_file'] = nil # gitlab_rails['redis_trace_chunks_instance'] = nil # gitlab_rails['redis_trace_chunks_sentinels'] = nil # gitlab_rails['redis_trace_chunks_sentinels_password'] = nil # gitlab_rails['redis_trace_chunks_username'] = nil # gitlab_rails['redis_trace_chunks_password'] = nil # gitlab_rails['redis_trace_chunks_cluster_nodes'] = nil +# gitlab_rails['redis_trace_chunks_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/' +# gitlab_rails['redis_trace_chunks_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' +# gitlab_rails['redis_trace_chunks_tls_client_cert_file'] = nil +# gitlab_rails['redis_trace_chunks_tls_client_key_file'] = nil # gitlab_rails['redis_actioncable_instance'] = nil # gitlab_rails['redis_actioncable_sentinels'] = nil # gitlab_rails['redis_actioncable_sentinels_password'] = nil # gitlab_rails['redis_actioncable_username'] = nil # gitlab_rails['redis_actioncable_password'] = nil # gitlab_rails['redis_actioncable_cluster_nodes'] = nil +# gitlab_rails['redis_actioncable_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/' +# gitlab_rails['redis_actioncable_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' +# gitlab_rails['redis_actioncable_tls_client_cert_file'] = nil +# gitlab_rails['redis_actioncable_tls_client_key_file'] = nil # gitlab_rails['redis_rate_limiting_instance'] = nil # gitlab_rails['redis_rate_limiting_sentinels'] = nil # gitlab_rails['redis_rate_limiting_sentinels_password'] = nil # gitlab_rails['redis_rate_limiting_username'] = nil # gitlab_rails['redis_rate_limiting_password'] = nil # gitlab_rails['redis_rate_limiting_cluster_nodes'] = nil +# gitlab_rails['redis_rate_limiting_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/' +# gitlab_rails['redis_rate_limiting_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' +# gitlab_rails['redis_rate_limiting_tls_client_cert_file'] = nil +# gitlab_rails['redis_rate_limiting_tls_client_key_file'] = nil # gitlab_rails['redis_sessions_instance'] = nil # gitlab_rails['redis_sessions_sentinels'] = nil # gitlab_rails['redis_sessions_sentinels_password'] = nil # gitlab_rails['redis_sessions_username'] = nil # gitlab_rails['redis_sessions_password'] = nil # gitlab_rails['redis_sessions_cluster_nodes'] = nil +# gitlab_rails['redis_sessions_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/' +# gitlab_rails['redis_sessions_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' +# gitlab_rails['redis_sessions_tls_client_cert_file'] = nil +# gitlab_rails['redis_sessions_tls_client_key_file'] = nil # gitlab_rails['redis_cluster_rate_limiting_instance'] = nil # gitlab_rails['redis_cluster_rate_limiting_sentinels'] = nil # gitlab_rails['redis_cluster_rate_limiting_sentinels_password'] = nil # gitlab_rails['redis_cluster_rate_limiting_username'] = nil # gitlab_rails['redis_cluster_rate_limiting_password'] = nil # gitlab_rails['redis_cluster_rate_limiting_cluster_nodes'] = nil +# gitlab_rails['redis_cluster_rate_limiting_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/' +# gitlab_rails['redis_cluster_rate_limiting_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' +# gitlab_rails['redis_cluster_rate_limiting_tls_client_cert_file'] = nil +# gitlab_rails['redis_cluster_rate_limiting_tls_client_key_file'] = nil # gitlab_rails['redis_repository_cache_instance'] = nil # gitlab_rails['redis_repository_cache_sentinels'] = nil # gitlab_rails['redis_repository_cache_sentinels_password'] = nil # gitlab_rails['redis_repository_cache_username'] = nil # gitlab_rails['redis_repository_cache_password'] = nil # gitlab_rails['redis_repository_cache_cluster_nodes'] = nil +# gitlab_rails['redis_repository_cache_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/' +# gitlab_rails['redis_repository_cache_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' +# gitlab_rails['redis_repository_cache_tls_client_cert_file'] = nil +# gitlab_rails['redis_repository_cache_tls_client_key_file'] = nil # gitlab_rails['redis_workhorse_instance'] = nil # gitlab_rails['redis_workhorse_sentinels'] = nil # gitlab_rails['redis_workhorse_sentinels_password'] = nil # gitlab_rails['redis_workhorse_username'] = nil # gitlab_rails['redis_workhorse_password'] = nil # gitlab_rails['redis_workhorse_cluster_nodes'] = nil +# gitlab_rails['redis_workhorse_tls_ca_cert_dir'] = '/opt/gitlab/embedded/ssl/certs/' +# gitlab_rails['redis_workhorse_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem' +# gitlab_rails['redis_workhorse_tls_client_cert_file'] = nil +# gitlab_rails['redis_workhorse_tls_client_key_file'] = nil # gitlab_rails['redis_workhorse_sentinel_master'] = nil @@ -975,7 +1019,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ### Registry database ###! Docs: https://docs.gitlab.com/ee/administration/packages/container_registry.html?tab=Linux+package+%28Omnibus%29#configure-a-metadata-database-for-the-container-registry -# registry['database'] = { +# registry['database'] = { # 'enabled' => true, # 'host' => 'localhost', # 'port' => 5432, @@ -993,7 +1037,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # 'maxidle' => 25, # 'maxopen' => 25, # 'maxlifetime' => '5m' -# } +# } # } ### Registry notifications endpoints @@ -2077,8 +2121,15 @@ nginx['listen_https'] = false ##! Environment variables for GitLab KAS # gitlab_kas['env'] = { # 'SSL_CERT_DIR' => "/opt/gitlab/embedded/ssl/certs/", -# # In a multi-node setup, this address MUST be reachable from other KAS instances. In a single-node setup, it can be on localhost for simplicity +# # In a multi-node setup, this address MUST be reachable from other KAS instances. In a single-node setup, +# # it can be on localhost for simplicity. +# # Use OWN_PRIVATE_API_CIDR + OWN_PRIVATE_API_PORT (optional) + OWN_PRIVATE_API_SCHEME (optional) if you cannot +# # specify a correct address for each KAS instance in OWN_PRIVATE_API_URL. # 'OWN_PRIVATE_API_URL' => 'grpc://localhost:8155' +# # 'OWN_PRIVATE_API_CIDR' => '10.0.0.0/8', # IPv4 example +# # 'OWN_PRIVATE_API_CIDR' => '2001:db8:8a2e:370::7334/64', # IPv6 example +# # 'OWN_PRIVATE_API_PORT' => '8155', # if not set, port from private_api_listen_address is used +# # 'OWN_PRIVATE_API_SCHEME' => 'grpc', # use grpcs when using TLS on private API endpoint # } ##! Error Reporting and Logging with Sentry @@ -2737,6 +2788,8 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__ # gitlab_rails['elastic_index_bulk_cron'] = "*/1 * * * *" # gitlab_rails['analytics_devops_adoption_create_all_snapshots_worker_cron'] = "0 4 * * 0" # gitlab_rails['ci_runners_stale_group_runners_prune_worker_cron'] = "30 * * * *" +# gitlab_rails['click_house_ci_finished_builds_sync_worker_cron'] = "*/3 * * * *" +# gitlab_rails['click_house_ci_finished_builds_sync_worker_args'] = [1] ################################################################################ ## Kerberos (EE Only) diff --git a/manifest.toml b/manifest.toml index fc5d4b0..770380e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "GitLab" description.en = "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features" description.fr = "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD" -version = "16.4.1~ynh1" +version = "16.5.0~ynh1" maintainers = ["kay0u"] diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 94e29de..ff5472a 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,22 +1,22 @@ #!/bin/bash -gitlab_version="16.4.1" +gitlab_version="16.5.0" # Upgrade path: https://gitlab-com.gitlab.io/support/toolbox/upgrade-path/ # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bookworm_source_sha256="df3b33056545cf5fe4924bfd0095a6522ef71eee625e9401d44501f305c9c5a9" -gitlab_x86_64_bullseye_source_sha256="7dd3d47f77f349497ef93f686686c3a778e318393ec2917775faa6fe1afb650e" -gitlab_x86_64_buster_source_sha256="83ac8ea1fc5e9e85e9da10860a7fbd43da80754f74dce3b7323ac65a846907fb" +gitlab_x86_64_bookworm_source_sha256="5d91d00aff827350ea36a86779753617d52d0edc402ae955bdf41d95942a1e60" +gitlab_x86_64_bullseye_source_sha256="b62f152992892fc6324821ee2058e1363c3decab4910eaa99574575fd47f6fdb" +gitlab_x86_64_buster_source_sha256="24eb4db9e044b4cc44b5b16b3d4cd97a600212eeee5eedb2ea1f86728df96cc2" -gitlab_arm64_bookworm_source_sha256="de2119bd329c1e62565e73471075303ff08e1632375f3e4e9b7930552f19ff2e" -gitlab_arm64_bullseye_source_sha256="dc981cb85db2b2661a18dc55611bedede4df0b7b3699195723fd0fbb3ada47b8" -gitlab_arm64_buster_source_sha256="2ccb99c2ed16121730735a037d288ec3d72385151a0461c2b9893ec458d1310a" +gitlab_arm64_bookworm_source_sha256="9f8837e3970165c87cc373bb90fc4833131e492af80c035ac3b4aab04903e56a" +gitlab_arm64_bullseye_source_sha256="1b428c362e20ecd35525f3c1a86525a9d960204fc8732c602ea5a43be657cbd7" +gitlab_arm64_buster_source_sha256="f009f6f23c56b028f0d653d28baf849a5770419c17c189d59827edd71f5a18ed" gitlab_arm_bookworm_source_sha256="" -gitlab_arm_bullseye_source_sha256="e86dbe38bae3488f40ea6c1d2405ba632af687b1d410902d6fe1c4a6e943883f" -gitlab_arm_buster_source_sha256="f59e68495d2916992e3f91216f38d489367abb2061fad22a38d9b4ecc969a7aa" +gitlab_arm_bullseye_source_sha256="552c65f1f41c632d3675c495136c028f9b9ca4b75374525d74f2b6aa7e47596d" +gitlab_arm_buster_source_sha256="47cc1a152c8a86cf225eed75337d349cd31738efd92d2c8c1fa5c96fd47df08f" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) From 42f34f3a1752944a0bd6f5c4f068291f2eca01d2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 27 Oct 2023 09:39:41 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d295c69..d9ce619 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features -**Shipped version:** 16.4.1~ynh1 +**Shipped version:** 16.5.0~ynh1 **Demo:** https://gitlab.com/explore @@ -31,6 +31,7 @@ Git-repository manager providing wiki, issue-tracking and CI/CD pipeline feature * Official app website: * Official admin documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 59319e4..d1580fc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD -**Version incluse :** 16.4.1~ynh1 +**Version incluse :** 16.5.0~ynh1 **Démo :** https://gitlab.com/explore @@ -31,6 +31,7 @@ Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bu * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From f18afe6ffb4ad8fe3af45e1ad2a9a74a680e0971 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 27 Oct 2023 11:52:56 +0200 Subject: [PATCH 3/4] create swap only if the server has less than 4Go of RAM --- scripts/install | 6 +++--- scripts/restore | 6 +++--- scripts/upgrade | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index 228decb..a398886 100644 --- a/scripts/install +++ b/scripts/install @@ -75,13 +75,13 @@ ynh_app_setting_set --app=$app --key=puma_min_threads --value=$puma_min_threads # ADD SWAP IF NEEDED #================================================= -total_swap=$(ynh_get_ram --total --only_swap) +total_ram=$(ynh_get_ram --total) swap_needed=0 # https://docs.gitlab.com/ce/install/requirements.html#memory # Need at least 2Go of swap -if [ $total_swap -lt 2048 ]; then - swap_needed=$((2048 - total_swap)) +if [ $total_ram -lt 4096 ]; then + swap_needed=2048 fi if [ $swap_needed -gt 0 ]; then diff --git a/scripts/restore b/scripts/restore index 6229acd..cb9b69e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -22,13 +22,13 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" # ADD SWAP IF NEEDED #================================================= -total_swap=$(ynh_get_ram --total --only_swap) +total_ram=$(ynh_get_ram --total) swap_needed=0 # https://docs.gitlab.com/ce/install/requirements.html#memory # Need at least 2Go of swap -if [ $total_swap -lt 2048 ]; then - swap_needed=$((2048 - total_swap)) +if [ $total_ram -lt 4096 ]; then + swap_needed=2048 fi if [ $swap_needed -gt 0 ]; then diff --git a/scripts/upgrade b/scripts/upgrade index 634757f..9fc057c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,13 +94,13 @@ ynh_app_setting_set --app=$app --key=puma_worker_processes --value=$puma_worker_ # ADD SWAP IF NEEDED #================================================= -total_swap=$(ynh_get_ram --total --only_swap) +total_ram=$(ynh_get_ram --total) swap_needed=0 # https://docs.gitlab.com/ce/install/requirements.html#memory # Need at least 2Go of swap -if [ $total_swap -lt 2048 ]; then - swap_needed=$((2048 - total_swap)) +if [ $total_ram -lt 4096 ]; then + swap_needed=2048 fi if [ $swap_needed -gt 0 ]; then From dd7ab571dbeb4157c4d14aaab3053ee8c2608943 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 27 Oct 2023 13:17:13 +0200 Subject: [PATCH 4/4] puma is automatically configured --- conf/gitlab.rb | 6 +++--- scripts/install | 27 --------------------------- scripts/upgrade | 39 +++++++++++---------------------------- upgrade-versions.sh | 3 --- 4 files changed, 14 insertions(+), 61 deletions(-) diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 3f2be1c..54d9af8 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -1190,9 +1190,9 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # puma['enable'] = true # puma['ha'] = false # puma['worker_timeout'] = 60 -puma['worker_processes'] = __PUMA_WORKER_PROCESSES__ -puma['min_threads'] = __PUMA_MIN_THREADS__ -puma['max_threads'] = __PUMA_MAX_THREADS__ +# puma['worker_processes'] = 2 +# puma['min_threads'] = 4 +# puma['max_threads'] = 4 ### Advanced settings # puma['listen'] = '127.0.0.1' diff --git a/scripts/install b/scripts/install index a398886..3207bcb 100644 --- a/scripts/install +++ b/scripts/install @@ -44,33 +44,6 @@ ynh_app_setting_set --app=$app --key=overwrite_nginx --value="1" #================================================= # STANDARD MODIFICATIONS -#================================================= -# DEFINE THE NUMBER OF WORKERS USED -#================================================= - -total_memory=$(ynh_get_ram --total) - -if [ $total_memory -lt 4096 ]; then - #https://docs.gitlab.com/omnibus/settings/puma.html#running-in-memory-constrained-environments - puma_worker_processes=0 -else - #https://docs.gitlab.com/ce/install/requirements.html#puma-workers - puma_worker_processes=$(( $(nproc) > 2 ? $(($(nproc) - 1)) : 2 )) -fi - -# If the server has less than 2GB of RAM -if [ $(ynh_get_ram --total --ignore_swap) -lt 2048 ]; then - puma_min_threads=1 - puma_max_threads=1 -else - puma_min_threads=2 - puma_max_threads=4 -fi - -ynh_app_setting_set --app=$app --key=puma_worker_processes --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 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 9fc057c..c87e646 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -28,20 +28,19 @@ fi config_path=/etc/$app chmod 755 $install_dir -if [ -z "$puma_max_threads" ] || [ -z "$puma_min_threads" ]; 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 - puma_min_threads=2 - puma_max_threads=4 - fi +if [ -n $(ynh_app_setting_get --app=$app --key=puma_worker_processes) ] +then + ynh_app_setting_delete --app=$app --key=puma_worker_processes +fi - 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 +if [ -n $(ynh_app_setting_get --app=$app --key=puma_max_threads) ] +then + ynh_app_setting_delete --app=$app --key=puma_max_threads +fi - ynh_app_setting_delete --app=$app --key=unicorn_worker_processes +if [ -n $(ynh_app_setting_get --app=$app --key=puma_min_threads) ] +then + ynh_app_setting_delete --app=$app --key=puma_min_threads fi # If architecture doesn't exist, create it @@ -74,22 +73,6 @@ fi #================================================= # STANDARD UPGRADE STEPS -#================================================= -# DEFINE THE NUMBER OF WORKERS USED -#================================================= - -total_memory=$(ynh_get_ram --total) - -if [ $total_memory -lt 4096 ]; then - #https://docs.gitlab.com/omnibus/settings/puma.html#running-in-memory-constrained-environments - puma_worker_processes=0 -else - #https://docs.gitlab.com/ce/install/requirements.html#puma-workers - puma_worker_processes=$(( $(nproc) > 2 ? $(($(nproc) - 1)) : 2 )) -fi - -ynh_app_setting_set --app=$app --key=puma_worker_processes --value=$puma_worker_processes - #================================================= # ADD SWAP IF NEEDED #================================================= diff --git a/upgrade-versions.sh b/upgrade-versions.sh index b045eb3..9829b4d 100755 --- a/upgrade-versions.sh +++ b/upgrade-versions.sh @@ -128,9 +128,6 @@ EOS" 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'] = __PORT_PUMA__/" $conf_file # Change sidekiq settings