diff --git a/README.md b/README.md index 30d7602..de363c6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,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.18~ynh4 +**Shipped version:** 1.18.1~ynh1 **Demo:** http://www.ostickethacks.com/demo/demo_info.php diff --git a/README_fr.md b/README_fr.md index 6e24914..5f969ae 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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.18~ynh4 +**Version incluse :** 1.18.1~ynh1 **Démo :** http://www.ostickethacks.com/demo/demo_info.php diff --git a/manifest.toml b/manifest.toml index d5216a7..ace27f1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "osTicket" description.en = "Open source support ticket system" description.fr = "Système de ticket de support open source" -version = "1.18~ynh4" +version = "1.18.1~ynh1" maintainers = ["yalh76"] @@ -17,11 +17,14 @@ userdoc = "https://docs.osticket.com" code = "https://github.com/osTicket/osTicket" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = true + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -41,8 +44,8 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" - select = ["en_US", "fr", "ar_EG", "ar_SA", "az", "bg", "bn", "bs", "ca", "cs", "da", "de", "el", "en_GB", "es_AR", "es_ES", "es_MX", "et", "eu", "fa", "fi", "he", "hi", "hr", "hu", "id", "is", "it", "ja", "ka", "km", "ko", "lt", "lv", "mk", "mn", "ms", "nl", "no", "pl", "pt_BR", "pt_PT", "ro", "ru", "sk", "sl", "sq", "sr", "sr_CS", "sv_SE", "sw", "th", "tr", "uk", "ur_IN", "ur_PK", "vi", "zh_CN", "zh_TW"] + type = "select" + choices = ["en_US", "fr", "ar_EG", "ar_SA", "az", "bg", "bn", "bs", "ca", "cs", "da", "de", "el", "en_GB", "es_AR", "es_ES", "es_MX", "et", "eu", "fa", "fi", "he", "hi", "hr", "hu", "id", "is", "it", "ja", "ka", "km", "ko", "lt", "lv", "mk", "mn", "ms", "nl", "no", "pl", "pt_BR", "pt_PT", "ro", "ru", "sk", "sl", "sq", "sr", "sr_CS", "sv_SE", "sw", "th", "tr", "uk", "ur_IN", "ur_PK", "vi", "zh_CN", "zh_TW"] default = "fr" [install.admin] @@ -74,8 +77,8 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_commit" [resources.sources.core-plugins] - url = "https://github.com/osTicket/osTicket-plugins/archive/4b545313f38a2f7f0e5b7e9b9c5e89dd629e51cf.tar.gz" - sha256 = "3ef516cea9e0447cb1a86564fcb2dd84676e507906829f181c1c454fbc91fcf4" + url = "https://github.com/osTicket/osTicket-plugins/archive/2bb771799a54dbacddfcf87851ca534e3b2af2dc.tar.gz" + sha256 = "9e5edc6da09302e149010dd69f0e40251c8780745c9f4058e7a0ce4292e5cf62" autoupdate.upstream = "https://github.com/osTicket/osTicket-plugins" autoupdate.strategy = "latest_github_commit" @@ -92,8 +95,8 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_commit" [resources.sources.main] - url = "https://github.com/osTicket/osTicket/archive/refs/tags/v1.18.tar.gz" - sha256 = "5041cd079f16b1e98718d4397a878f185d69d72ec197b3875c8da5856f8ca774" + url = "https://github.com/osTicket/osTicket/archive/refs/tags/v1.18.1.tar.gz" + sha256 = "a30a32661355a0ff59ca8a870a5c4de3c03a5ecef6d3e97a65d6222ed8444496" autoupdate.strategy = "latest_github_tag" [resources.sources.plugin-attachment_preview] @@ -144,7 +147,7 @@ ram.runtime = "50M" api.protected = true [resources.apt] - packages = "mariadb-server php8.2-mysql php8.2-gd php-php-gettext php8.2-imap php8.2-fpm php8.2-mbstring php8.2-xml php8.2-zip php8.2-intl php8.2-curl curl" + packages = "mariadb-server, php8.2-mysql, php8.2-gd, php-php-gettext, php8.2-imap, php8.2-mbstring, php8.2-xml, php8.2-zip, php8.2-intl, php8.2-curl, curl" [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index d5d8b59..db7f196 100644 --- a/scripts/install +++ b/scripts/install @@ -43,21 +43,9 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# SPECIFIC SETUP -#================================================= -# SET THE CRON FILE -#================================================= -ynh_script_progression --message="Setting the cron file..." --weight=1 - ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" #================================================= @@ -75,9 +63,11 @@ chown $app:www-data "$install_dir/include/ost-config.php" #================================================= ynh_script_progression --message="Building plugins..." --weight=1 -ynh_exec_as $app mkdir -p "$install_dir/include/plugins/build/.config/composer" -export COMPOSER_HOME="$install_dir/include/plugins/build/.config/composer" +mkdir -p "$install_dir/include/plugins/build/.config/composer" +chmod 660 "$install_dir/include/plugins/build/.config/composer" +chown $app:www-data "$install_dir/include/plugins/build/.config/composer" +export COMPOSER_HOME="$install_dir/include/plugins/build/.config/composer" pushd "$install_dir/include/plugins/build" ynh_exec_warn_less ynh_exec_as $app php$phpversion make.php hydrate ynh_exec_warn_less ynh_exec_as $app php$phpversion -dphar.readonly=0 make.php build auth-cas diff --git a/scripts/remove b/scripts/remove index 3242cce..a18a484 100644 --- a/scripts/remove +++ b/scripts/remove @@ -17,21 +17,9 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE VARIOUS FILES -#================================================= -ynh_script_progression --message="Removing various files..." --weight=1 - # Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" diff --git a/scripts/restore b/scripts/restore index 8cc7521..1a4ea57 100644 --- a/scripts/restore +++ b/scripts/restore @@ -21,20 +21,6 @@ chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -43,9 +29,13 @@ ynh_script_progression --message="Restoring the MySQL database..." --weight=1 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= -# RESTORE VARIOUS FILES +# RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring various files..." --weight=1 +ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index 97438b1..e630717 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -64,14 +64,11 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - # Create a dedicated NGINX config ynh_add_nginx_config +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" + #================================================= # SPECIFIC UPGRADE #================================================= @@ -127,13 +124,6 @@ pushd "$install_dir" php$phpversion manage.php upgrade popd -#================================================= -# SET THE CRON FILE -#================================================= -ynh_script_progression --message="Setting the cron file..." --weight=1 - -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" - #================================================= # END OF SCRIPT #=================================================