diff --git a/README.md b/README.md index 03b5ed0..eaa3b88 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 @@ -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 b5633c6..2663c0a 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 @@ -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/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/change_url b/scripts/change_url index 80c4f41..46334d1 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 @@ -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 fcf86b9..3583c85 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 @@ -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 4665184..9f5c60b 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 #================================================= @@ -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 235d58e..294f022 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=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" @@ -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 @@ -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 39cb226..7cd6573 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 #================================================= @@ -216,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 @@ -238,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 @@ -291,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" @@ -324,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 @@ -353,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 @@ -361,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 @@ -369,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 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)