From 40675d8f2c3af929779d1e88e67660f5b0e901d0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Dec 2020 16:58:58 +0100 Subject: [PATCH] Upgarde to 13.7.0 --- README.md | 4 ++-- README_fr.md | 4 ++-- check_process | 2 -- conf/arm.src.default | 2 +- conf/x86-64.src.default | 2 +- manifest.json | 2 +- scripts/backup | 12 ++++++------ scripts/upgrade | 7 ------- scripts/upgrade.d/upgrade.last.sh | 6 +++--- 9 files changed, 16 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 03b5ed0..5e95c6c 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 diff --git a/README_fr.md b/README_fr.md index b5633c6..746507a 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 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/upgrade b/scripts/upgrade index 39cb226..d3decec 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 #================================================= 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)