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 #=================================================