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