From d1d53546234725db522abd449e6486735d773375 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 16 Feb 2022 01:31:59 +0100 Subject: [PATCH 1/4] Upgrade to 1.16.1~ynh1 --- README.md | 2 +- README_fr.md | 2 +- check_process | 4 ++++ conf/app.src | 4 ++-- manifest.json | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 272db3a..9885adb 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in osTicket is a widely-used open source support ticket system. It seamlessly integrates inquiries created via email, phone and web-based forms into a simple easy-to-use multi-user web interface. Manage, organize and archive all your support requests and responses in one place while providing your customers with accountability and responsiveness they deserve. -**Shipped version:** 1.16~ynh1 +**Shipped version:** 1.16.1~ynh1 **Demo:** http://www.ostickethacks.com/demo/demo_info.php diff --git a/README_fr.md b/README_fr.md index 9b6ac54..ada05f0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour osTicket is a widely-used open source support ticket system. It seamlessly integrates inquiries created via email, phone and web-based forms into a simple easy-to-use multi-user web interface. Manage, organize and archive all your support requests and responses in one place while providing your customers with accountability and responsiveness they deserve. -**Version incluse :** 1.16~ynh1 +**Version incluse :** 1.16.1~ynh1 **Démo :** http://www.ostickethacks.com/demo/demo_info.php diff --git a/check_process b/check_process index 0e85d9d..2dfd99a 100644 --- a/check_process +++ b/check_process @@ -28,6 +28,8 @@ upgrade=1 from_commit=049b860396347599e0633adf277549146644e460 # 1.15.4~ynh2 upgrade=1 from_commit=9af7e309b19966c19dab60fbb54a46b6d2269323 + # 1.16~ynh1 + upgrade=1 from_commit=37c6fe88f2a06e9b84fd2ad486b5e51f6345254d backup_restore=1 multi_instance=1 port_already_use=0 @@ -50,3 +52,5 @@ Notification=none name=1.15.3.1~ynh1 ; commit=9af7e309b19966c19dab60fbb54a46b6d2269323 name=1.15.4~ynh2 + ; commit=37c6fe88f2a06e9b84fd2ad486b5e51f6345254d + name=1.16~ynh1 diff --git a/conf/app.src b/conf/app.src index f6bda90..28719b0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/osTicket/osTicket/releases/download/v1.16/osTicket-v1.16.zip -SOURCE_SUM=cebf6bb58e41044cee7c6e1493e6e88e7f5aa8739e7260d034001b613fe1eedf +SOURCE_URL=https://github.com/osTicket/osTicket/releases/download/v1.16.1/osTicket-v1.16.1.zip +SOURCE_SUM=4cfb6a297b48f551b0988a7df72448fe7ec22ee38e4023fafc19ead41fb76b38 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 9d55a8d..3994a22 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source support ticket system", "fr": "Système de ticket de support open source" }, - "version": "1.16~ynh1", + "version": "1.16.1~ynh1", "url": "https://osticket.com", "upstream": { "license": "GPL-2.0-or-later", From 8d080f3c6bfc82afc884caaca883a3e060fd0e46 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 18 Feb 2022 00:42:48 +0100 Subject: [PATCH 2/4] Upgrade to PHP8.0 --- scripts/_common.sh | 6 +++++- scripts/upgrade | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 71ceb03..ebde0ed 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,11 @@ # COMMON VARIABLES #================================================= -pkg_dependencies="curl php${YNH_PHP_VERSION}-gd php-php-gettext php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-curl" +YNH_PHP_VERSION="8.0" + +pkg_dependencies="curl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php-php-gettext php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl" + +# php${YNH_PHP_VERSION}-apcu #================================================= # PERSONAL HELPERS diff --git a/scripts/upgrade b/scripts/upgrade index 6f5593f..235608b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -177,6 +177,15 @@ then ynh_secure_remove --file="$final_path/setup" fi +#================================================= +# UPGRADE OSTICKET +#================================================= +ynh_script_progression --message="Upgrading the application..." + +pushd "$final_path" + php$phpversion manage.php upgrade +popd + #================================================= # SET THE CRON FILE #================================================= From 0331cf7cdd007eaf5a6b398b2a9fcd09d3ba8ce6 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 18 Feb 2022 00:51:14 +0100 Subject: [PATCH 3/4] Update az.phar --- conf/i18n/az.phar | Bin 306649 -> 312596 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/conf/i18n/az.phar b/conf/i18n/az.phar index 38db351824fbe35f2a200682eb2fd0e85b56513e..39a189ad877ddf29d6a7b81488d27895280449a9 100644 GIT binary patch delta 11637 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 From 66ffd6812c202f10bd33b4ab7d1d9c697b0da6ba Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 18 Feb 2022 02:54:31 +0100 Subject: [PATCH 4/4] Fix restore --- manifest.json | 2 +- scripts/install | 2 +- scripts/restore | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest.json b/manifest.json index 3994a22..7ccfae4 100644 --- a/manifest.json +++ b/manifest.json @@ -29,7 +29,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" diff --git a/scripts/install b/scripts/install index e449011..59d6560 100644 --- a/scripts/install +++ b/scripts/install @@ -68,7 +68,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Configuring system user..." # Create a system user -ynh_system_user_create --username=$app --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # CREATE A MYSQL DATABASE diff --git a/scripts/restore b/scripts/restore index f175025..eb67579 100644 --- a/scripts/restore +++ b/scripts/restore @@ -70,6 +70,16 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# SPECIFIC RESTORATION +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." + +# Define and install dependencies +ynh_install_app_dependencies $pkg_dependencies + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -81,16 +91,6 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_add_fpm_config --usage=low --footprint=low phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -#================================================= -# SPECIFIC RESTORATION -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." - -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies - #================================================= # RESTORE THE MYSQL DATABASE #=================================================