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/conf/i18n/az.phar b/conf/i18n/az.phar index 38db351..39a189a 100644 Binary files a/conf/i18n/az.phar and b/conf/i18n/az.phar differ diff --git a/manifest.json b/manifest.json index 9d55a8d..7ccfae4 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", @@ -29,7 +29,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" 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/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 #================================================= 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 #=================================================