From 8348a929b442a57c0151fab1b2e06d0b276633c4 Mon Sep 17 00:00:00 2001 From: kay0u Date: Fri, 23 Aug 2019 21:44:38 +0200 Subject: [PATCH 1/5] Upgrade to 12.2.0 --- README.md | 2 +- conf/gitlab.rb | 71 +++++++++++++++++++++++++------ manifest.json | 2 +- scripts/backup | 2 +- scripts/install | 6 +-- scripts/restore | 7 ++- scripts/upgrade | 4 +- scripts/upgrade.d/upgrade.last.sh | 6 +-- 8 files changed, 75 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 5a7fd5f..548098e 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.1.6 +**Shipped version:** 12.2.0 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index a45339c..3d28a80 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -109,7 +109,7 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! https://docs.gitlab.com/ce/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'] = "41 * * * *" +# gitlab_rails['pipeline_schedule_worker_cron'] = "19 * * * *" # 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" @@ -131,6 +131,34 @@ external_url '__GENERATED_EXTERNAL_URL__' ###! will appear signed in from that address.** # gitlab_rails['trusted_proxies'] = [] +### Content Security Policy +####! Customize if you want to enable the Content-Security-Policy header, which +####! can help thwart JavaScript cross-site scripting (XSS) attacks. +####! See: https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP +# gitlab_rails['content_security_policy'] = { +# 'enabled' => false, +# 'report_only' => false, +# # Each directive is a String (e.g. "'self'"). +# 'directives' => { +# 'base_uri' => nil, +# 'child_src' => nil, +# 'connect_src' => nil, +# 'default_src' => nil, +# 'font_src' => nil, +# 'form_action' => nil, +# 'frame_ancestors' => nil, +# 'frame_src' => nil, +# 'img_src' => nil, +# 'manifest_src' => nil, +# 'media_src' => nil, +# 'object_src' => nil, +# 'script_src' => nil, +# 'style_src' => nil, +# 'worker_src' => nil, +# 'report_uri' => nil, +# } +# } + ### Monitoring settings ###! IP whitelist controlling access to monitoring endpoints # gitlab_rails['monitoring_whitelist'] = ['127.0.0.0/8', '::1/128'] @@ -438,7 +466,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ #### Set path to an initial license to be used while bootstrapping GitLab. ####! **Only applicable on initial setup, future license updations need to be done via UI. ####! Updating the file specified in this path won't yield any change after the first reconfigure run. -# gitlab_rails['iniitial_license_file'] = '/etc/gitlab/company.gitlab-license' +# gitlab_rails['initial_license_file'] = '/etc/gitlab/company.gitlab-license' #### Enable or disable automatic database migrations # gitlab_rails['auto_migrate'] = true @@ -527,7 +555,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ ##! Docs: https://docs.gitlab.com/ce/administration/container_registry.html ################################################################################ -# registry_external_url 'https://registry.gitlab.example.com' +# registry_external_url 'https://registry.example.com' ### Settings used by GitLab application # gitlab_rails['registry_enabled'] = true @@ -570,6 +598,7 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # 's3' => { # 'accesskey' => 'AKIAKIAKI', # 'secretkey' => 'secret123', +# 'region' => 'us-east-1', # 'bucket' => 'gitlab-registry-bucket-AKIAKIAKI' # } # } @@ -894,6 +923,9 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # See https://www.postgresql.org/docs/9.6/static/auth-pg-hba-conf.html for an explanation # of the values +### Version settings +# Set this if you have disabled the bundled PostgreSQL but still want to use the backup rake tasks +# postgresql['version'] = 10 ################################################################################ ## GitLab Redis @@ -918,6 +950,16 @@ sidekiq['listen_port'] = __SIDEKIQ_PORT__ # redis['uid'] = nil # redis['gid'] = nil +### Disable or obfuscate unnecessary redis command names +### Uncomment and edit this block to add or remove entries. +### See https://docs.gitlab.com/omnibus/settings/redis.html#renamed-commands +### for detailed usage +### +# redis['rename_commands'] = { +# 'KEYS': '' +#} +# + ###! **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 @@ -1003,12 +1045,12 @@ nginx['client_max_body_size'] = '__CLIENT_MAX_BODY_SIZE__' # nginx['ssl_certificate'] = "/etc/gitlab/ssl/#{node['fqdn']}.crt" # nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/#{node['fqdn']}.key" -# nginx['ssl_ciphers'] = "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256" +# nginx['ssl_ciphers'] = "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256" # nginx['ssl_prefer_server_ciphers'] = "on" ##! **Recommended by: https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html ##! https://cipherli.st/** -# nginx['ssl_protocols'] = "TLSv1.2" +# nginx['ssl_protocols'] = "TLSv1.2 TLSv1.3" ##! **Recommended in: https://nginx.org/en/docs/http/ngx_http_ssl_module.html** # nginx['ssl_session_cache'] = "builtin:1000 shared:SSL:10m" @@ -1266,6 +1308,9 @@ nginx['listen_https'] = false # gitlab_pages['gitlab_server'] = nil # Defaults to external_url # gitlab_pages['auth_secret'] = nil # Generated if not present +##! Define custom gitlab-pages HTTP headers for the whole instance +# gitlab_pages['headers'] = [] + ################################################################################ ## GitLab Pages NGINX ################################################################################ @@ -1440,9 +1485,9 @@ nginx['listen_https'] = false ### Custom Prometheus flags # # prometheus['flags'] = { -# 'storage.tsdb.path' => "#{node['gitlab']['prometheus']['home']}/data", +# 'storage.tsdb.path' => "/var/opt/gitlab/prometheus/data", # 'storage.tsdb.retention.time' => "15d", -# 'config.file' => "#{node['gitlab']['prometheus']['home']}/prometheus.yml" +# 'config.file' => "/var/opt/gitlab/prometheus/prometheus.yml" # } ##! Advanced settings. Should be changed only if absolutely needed. @@ -1457,9 +1502,9 @@ nginx['listen_https'] = false # alertmanager['log_directory'] = '/var/log/gitlab/alertmanager' # alertmanager['admin_email'] = 'admin@example.com' # alertmanager['flags'] = { -# 'web.listen-address' => "#{node['gitlab']['alertmanager']['listen_address']}" -# 'storage.path' => "#{node['gitlab']['alertmanager']['home']}/data" -# 'config.file' => "#{node['gitlab']['alertmanager']['home']}/alertmanager.yml" +# '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' # alertmanager['env'] = { @@ -1478,7 +1523,7 @@ nginx['listen_https'] = false # node_exporter['home'] = '/var/opt/gitlab/node-exporter' # node_exporter['log_directory'] = '/var/log/gitlab/node-exporter' # node_exporter['flags'] = { -# 'collector.textfile.directory' => "#{node['gitlab']['node-exporter']['home']}/textfile_collector" +# 'collector.textfile.directory' => "/var/opt/gitlab/node-exporter/textfile_collector" # } # node_exporter['env_directory'] = '/opt/gitlab/etc/node-exporter/env' # node_exporter['env'] = { @@ -1496,7 +1541,7 @@ nginx['listen_https'] = false # redis_exporter['enable'] = true # redis_exporter['log_directory'] = '/var/log/gitlab/redis-exporter' # redis_exporter['flags'] = { -# 'redis.addr' => "unix://#{node['gitlab']['gitlab-rails']['redis_socket']}", +# 'redis.addr' => "unix:///var/opt/gitlab/redis/redis.socket", # } # redis_exporter['env_directory'] = '/opt/gitlab/etc/redis-exporter/env' # redis_exporter['env'] = { @@ -1565,6 +1610,8 @@ grafana['enable'] = false # grafana['home'] = '/var/opt/gitlab/grafana' # grafana['admin_password'] = 'admin' # grafana['allow_user_sign_up'] = false +# grafana['basic_auth_enabled'] = false +# grafana['disable_login_form'] = true # grafana['gitlab_application_id'] = 'GITLAB_APPLICATION_ID' # grafana['gitlab_secret'] = 'GITLAB_SECRET' # grafana['env_directory'] = '/opt/gitlab/etc/grafana/env' diff --git a/manifest.json b/manifest.json index d9daf42..4b60bc6 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.1.6~ynh1", + "version": "12.2.0~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/backup b/scripts/backup index e25ab0b..895d95e 100644 --- a/scripts/backup +++ b/scripts/backup @@ -49,7 +49,7 @@ ynh_script_progression --message="Backuping of Gitlab..." --weight=9 # 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 -gitlab-rake gitlab:backup:create BACKUP=last +gitlab-backup create BACKUP=last ynh_backup --src_path="/var/opt/$app/backups/last_gitlab_backup.tar" diff --git a/scripts/install b/scripts/install index 99402e0..d6d9c68 100644 --- a/scripts/install +++ b/scripts/install @@ -54,8 +54,8 @@ else your hardware and the result of the command \"uname -m\"." 1 fi -# https://docs.gitlab.com/ee/install/requirements.html#unicorn-workers -unicorn_worker_processes=$(($(nproc) + 1 )) +# https://docs.gitlab.com/ce/install/requirements.html#unicorn-workers +unicorn_worker_processes=$(python -c "print(int($(nproc) * 1.5 + 1))") # If the server has at least 2GB of RAM if [ $(ynh_check_ram --no_swap) -ge 2000 ]; then @@ -120,7 +120,7 @@ total_memory=$(ynh_check_ram) total_swap=$(ynh_check_ram --only_swap) swap_needed=0 -# https://docs.gitlab.com/ee/install/requirements.html#memory +# https://docs.gitlab.com/ce/install/requirements.html#memory if [ $total_memory -lt 8192 ]; then # Need a minimum of 8Go of memory swap_needed=$((8192 - $total_memory)) diff --git a/scripts/restore b/scripts/restore index 1aed979..be424b5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -71,7 +71,7 @@ total_memory=$(ynh_check_ram) total_swap=$(ynh_check_ram --only_swap) swap_needed=0 -# https://docs.gitlab.com/ee/install/requirements.html#memory +# https://docs.gitlab.com/ce/install/requirements.html#memory if [ $total_memory -lt 8192 ]; then # Need a minimum of 8Go of memory swap_needed=$((8192 - $total_memory)) @@ -141,7 +141,10 @@ gitlab-ctl stop sidekiq # Use gitlab-rake to backup # Doc: https://docs.gitlab.com/ce/raketasks/backup_restore.html#restore-for-omnibus-gitlab-installations -ynh_exec_warn_less gitlab-rake gitlab:backup:restore force=yes BACKUP=$last_backup +ynh_exec_warn_less gitlab-backup restore force=yes BACKUP=$last_backup + +# https://docs.gitlab.com/ce/raketasks/backup_restore.html#container-registry-push-failures-after-restoring-from-a-backup +chown -R registry:registry /var/opt/gitlab/gitlab-rails/shared/registry/docker #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 6b0baed..13b05ea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,7 +65,7 @@ if [ -z "$config_path" ]; then fi if [ -z "$unicorn_worker_processes" ]; then - # https://docs.gitlab.com/ee/install/requirements.html#unicorn-workers + # https://docs.gitlab.com/ce/install/requirements.html#unicorn-workers unicorn_worker_processes=$(($(nproc) + 1 )) # If the server has at least 2GB of RAM @@ -188,7 +188,7 @@ total_memory=$(ynh_check_ram) total_swap=$(ynh_check_ram --only_swap) swap_needed=0 -# https://docs.gitlab.com/ee/install/requirements.html#memory +# https://docs.gitlab.com/ce/install/requirements.html#memory if [ $total_memory -lt 8192 ]; then # Need a minimum of 8Go of memory swap_needed=$((8192 - $total_memory)) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index c0ea22f..b549b79 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.1.6" +gitlab_version="12.2.0" -gitlab_x86_64_source_sha256="af4251dd4d0c5ff42f69e6ac09d4767e8be41314b63993a5959790ac78657c91" +gitlab_x86_64_source_sha256="c483581545891e65eafcc15b6cf2f620b8f5df34e4e26fb12da984556196ebeb" -gitlab_arm_source_sha256="adfa0120282fcc84e9dca85196dcc28dc2763d072581857fc592ef35ab3821ab" +gitlab_arm_source_sha256="231d115b3c0a459b9ee3cc47f432755cfacf2925190c996a59923c061eddf6cb" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From 4aebe8355f436ceb114d26c49e55be05f55dbaf8 Mon Sep 17 00:00:00 2001 From: kay0u Date: Sat, 24 Aug 2019 19:10:05 +0200 Subject: [PATCH 2/5] 12.2.1 --- README.md | 2 +- conf/gitlab.rb | 5 +++++ manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 548098e..9daedf1 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.2.0 +**Shipped version:** 12.2.1 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 3d28a80..39e88c0 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -71,6 +71,9 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['gitlab_email_display_name'] = 'Example' # gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com' # gitlab_rails['gitlab_email_subject_suffix'] = '' +# 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 user privileges # gitlab_rails['gitlab_default_can_create_group'] = true @@ -491,6 +494,8 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['db_sslmode'] = nil # gitlab_rails['db_sslcompression'] = 0 # gitlab_rails['db_sslrootcert'] = nil +# gitlab_rails['db_sslcert'] = nil +# gitlab_rails['db_sslkey'] = nil # gitlab_rails['db_prepared_statements'] = false # gitlab_rails['db_statements_limit'] = 1000 diff --git a/manifest.json b/manifest.json index 4b60bc6..f0bee36 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.2.0~ynh1", + "version": "12.2.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 b549b79..67b81ed 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.2.0" +gitlab_version="12.2.1" -gitlab_x86_64_source_sha256="c483581545891e65eafcc15b6cf2f620b8f5df34e4e26fb12da984556196ebeb" +gitlab_x86_64_source_sha256="102040c54d112738cddadff9f661f0e010e2bf5172c6f6d8f635ed2f8b9de6f7" -gitlab_arm_source_sha256="231d115b3c0a459b9ee3cc47f432755cfacf2925190c996a59923c061eddf6cb" +gitlab_arm_source_sha256="8418907a9a2a67b703c334d8d83e941c296f68d79e358b49107d52e92909f3df" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From a4af36c402cbeb3cac2424a049fccc56edf77a9a Mon Sep 17 00:00:00 2001 From: Kayou Date: Tue, 27 Aug 2019 00:10:39 +0200 Subject: [PATCH 3/5] Fix restore --- scripts/restore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index be424b5..ddd8ec1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -144,7 +144,9 @@ gitlab-ctl stop sidekiq ynh_exec_warn_less gitlab-backup restore force=yes BACKUP=$last_backup # https://docs.gitlab.com/ce/raketasks/backup_restore.html#container-registry-push-failures-after-restoring-from-a-backup -chown -R registry:registry /var/opt/gitlab/gitlab-rails/shared/registry/docker +if ynh_user_exists --username="registry" && [ -d "/var/opt/gitlab/gitlab-rails/shared/registry/docker" ]; then + chown -R registry:registry /var/opt/gitlab/gitlab-rails/shared/registry/docker +fi #================================================= # GENERIC FINALIZATION From 9470bfd368bd90f862272a73765d6df2bce3bd82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Bourr=C3=A9?= Date: Sun, 1 Sep 2019 03:29:22 +0200 Subject: [PATCH 4/5] 12.2.3 --- README.md | 2 +- conf/gitlab.rb | 5 ----- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 9daedf1..bdce8f1 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.2.1 +**Shipped version:** 12.2.3 ## Screenshots diff --git a/conf/gitlab.rb b/conf/gitlab.rb index 39e88c0..3d28a80 100644 --- a/conf/gitlab.rb +++ b/conf/gitlab.rb @@ -71,9 +71,6 @@ external_url '__GENERATED_EXTERNAL_URL__' # gitlab_rails['gitlab_email_display_name'] = 'Example' # gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com' # gitlab_rails['gitlab_email_subject_suffix'] = '' -# 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 user privileges # gitlab_rails['gitlab_default_can_create_group'] = true @@ -494,8 +491,6 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__ # gitlab_rails['db_sslmode'] = nil # gitlab_rails['db_sslcompression'] = 0 # gitlab_rails['db_sslrootcert'] = nil -# gitlab_rails['db_sslcert'] = nil -# gitlab_rails['db_sslkey'] = nil # gitlab_rails['db_prepared_statements'] = false # gitlab_rails['db_statements_limit'] = 1000 diff --git a/manifest.json b/manifest.json index f0bee36..b95e52e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.2.1~ynh1", + "version": "12.2.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 67b81ed..101291c 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,8 +1,8 @@ -gitlab_version="12.2.1" +gitlab_version="12.2.3" -gitlab_x86_64_source_sha256="102040c54d112738cddadff9f661f0e010e2bf5172c6f6d8f635ed2f8b9de6f7" +gitlab_x86_64_source_sha256="c7cb22bf7aee5bba4b9ebc2f04add53b68092bca18130a2ab3697a8583687770" -gitlab_arm_source_sha256="8418907a9a2a67b703c334d8d83e941c296f68d79e358b49107d52e92909f3df" +gitlab_arm_source_sha256="2be45cc1bb8a9f785c1ce8469bc11996be323c474b1d0d812b37e75a44bdd4dd" gitlab_filename="gitlab-ce-${gitlab_version}.deb" From fd6af9b07a556ff55f1cb7fe8ffab2394d32423a Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sun, 1 Sep 2019 12:57:53 +0200 Subject: [PATCH 5/5] Change unicorn_worker_processes --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index d6d9c68..f9a132e 100644 --- a/scripts/install +++ b/scripts/install @@ -55,7 +55,7 @@ else fi # https://docs.gitlab.com/ce/install/requirements.html#unicorn-workers -unicorn_worker_processes=$(python -c "print(int($(nproc) * 1.5 + 1))") +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 diff --git a/scripts/upgrade b/scripts/upgrade index 13b05ea..a366096 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -66,7 +66,7 @@ fi if [ -z "$unicorn_worker_processes" ]; then # https://docs.gitlab.com/ce/install/requirements.html#unicorn-workers - unicorn_worker_processes=$(($(nproc) + 1 )) + unicorn_worker_processes=$(bc <<< "($(nproc) * 1.5 + 1) / 1") # If the server has at least 2GB of RAM if [ $(free -g --si | grep Mem: | awk '{print $2}') -ge 2 ]; then