From 1589b20529a86bd7042b37fffdc132a09cbaa5b5 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Wed, 16 Aug 2023 13:42:45 +0200 Subject: [PATCH 01/13] Fix typo in nginx config --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index d5ce364..2798051 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,7 +9,7 @@ location __PATH__/ { # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file client_max_body_size 256M; - try_files $uri $uri/ index.php + try_files $uri $uri/ index.php; location ~ ^/pages/(?!index.php/)(.*) { try_files $uri $uri/ /pages/index.php/$1; From 82200e71bec3726db60bdd0d9c074d95d01d699f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 16 Aug 2023 13:54:04 +0200 Subject: [PATCH 02/13] cleaning --- manifest.toml | 4 ++-- scripts/remove | 12 ------------ scripts/restore | 22 ++++++---------------- scripts/upgrade | 14 ++------------ 4 files changed, 10 insertions(+), 42 deletions(-) diff --git a/manifest.toml b/manifest.toml index 162a820..391ff60 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~ynh3" +version = "1.18~ynh4" maintainers = ["yalh76"] @@ -17,7 +17,7 @@ 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 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 #================================================= From ff66ebc0510d550de4e14e355933bfa6ccfb9e9e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 16 Aug 2023 11:54:11 +0000 Subject: [PATCH 03/13] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 551c52b..2e935bd 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~ynh3 +**Shipped version:** 1.18~ynh4 **Demo:** http://www.ostickethacks.com/demo/demo_info.php diff --git a/README_fr.md b/README_fr.md index fa18389..3e15aa6 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~ynh3 +**Version incluse :** 1.18~ynh4 **Démo :** http://www.ostickethacks.com/demo/demo_info.php From 912f70dc390c0b05dfdcbe813ffce3b7a226b5bf Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Wed, 16 Aug 2023 14:00:22 +0200 Subject: [PATCH 04/13] Fixup composer dir --- scripts/install | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index d5d8b59..93c389b 100644 --- a/scripts/install +++ b/scripts/install @@ -75,9 +75,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 666 "$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 From 168c94b0e08eb5620e8495d534607c6a90271d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 16 Aug 2023 14:01:10 +0200 Subject: [PATCH 05/13] Update install --- scripts/install | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/scripts/install b/scripts/install index d5d8b59..c6b6e22 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" #================================================= From 2f3c589d91543ce9112475ddc1bbbe5aa0194a5a Mon Sep 17 00:00:00 2001 From: Serversonic <62808385+serversonic@users.noreply.github.com> Date: Wed, 16 Aug 2023 20:34:44 +0100 Subject: [PATCH 06/13] Update nginx.conf Missing semi colon in try_files at line 14 --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index d5ce364..2798051 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,7 +9,7 @@ location __PATH__/ { # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file client_max_body_size 256M; - try_files $uri $uri/ index.php + try_files $uri $uri/ index.php; location ~ ^/pages/(?!index.php/)(.*) { try_files $uri $uri/ /pages/index.php/$1; From b8b2550c7b69f523bc11962340ab41de9b5e7cd4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 25 Oct 2023 18:17:35 +0200 Subject: [PATCH 07/13] Upgrade to v1.18.1 --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 391ff60..75a9290 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"] @@ -74,8 +74,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 +92,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] From 7f363c0f7ebddacc8ce21349bc3536cb69881eba Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 25 Oct 2023 16:17:41 +0000 Subject: [PATCH 08/13] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2e935bd..8444f17 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 @@ -31,7 +31,6 @@ osTicket is a widely-used open source support ticket system. It seamlessly integ * Official app website: * Official user documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 3e15aa6..8874cfe 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 @@ -31,7 +31,6 @@ osTicket is a widely-used open source support ticket system. It seamlessly integ * Site officiel de l’app : * Documentation officielle utilisateur : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From 2028901fa4916525f22625980e1f961b1989f428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 11 Nov 2023 23:22:46 +0100 Subject: [PATCH 09/13] Update manifest.toml --- manifest.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 391ff60..138f9c9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,8 +20,11 @@ code = "https://github.com/osTicket/osTicket" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = true + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -41,7 +44,7 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "select" 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"] default = "fr" @@ -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" From 46f1c7af28a9ad2fe16f597ea8de095302370926 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 11 Nov 2023 22:22:51 +0000 Subject: [PATCH 10/13] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2e935bd..30d7602 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ osTicket is a widely-used open source support ticket system. It seamlessly integ * Official app website: * Official user documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 3e15aa6..6e24914 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ osTicket is a widely-used open source support ticket system. It seamlessly integ * Site officiel de l’app : * Documentation officielle utilisateur : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From babeae5574237a4738216411d1cca1c688f17ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 11 Nov 2023 23:36:52 +0100 Subject: [PATCH 11/13] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 138f9c9..b832509 100644 --- a/manifest.toml +++ b/manifest.toml @@ -45,7 +45,7 @@ ram.runtime = "50M" ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" type = "select" - 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"] + 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] From b0cfe9bd09a31d77ec1dcab39de7bed83479a420 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 11 Nov 2023 22:39:28 +0000 Subject: [PATCH 12/13] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 8444f17..de363c6 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ osTicket is a widely-used open source support ticket system. It seamlessly integ * Official app website: * Official user documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 8874cfe..5f969ae 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,6 +31,7 @@ osTicket is a widely-used open source support ticket system. It seamlessly integ * Site officiel de l’app : * Documentation officielle utilisateur : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 06a9b6dd78bb21bbf82e241346859ace184020aa Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 Nov 2023 18:20:57 +0100 Subject: [PATCH 13/13] Update scripts/install Co-authored-by: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 008768a..db7f196 100644 --- a/scripts/install +++ b/scripts/install @@ -64,7 +64,7 @@ chown $app:www-data "$install_dir/include/ost-config.php" ynh_script_progression --message="Building plugins..." --weight=1 mkdir -p "$install_dir/include/plugins/build/.config/composer" -chmod 666 "$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"