From d770fbc3a5baddf2ef809c1cc9f251d54906af88 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 2 Dec 2023 17:16:03 +0100 Subject: [PATCH 1/5] Upgrade to v1.8.110 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 6b0f3b9..f3a7b4f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "FreeScout" description.en = "Help desk & shared mailbox" description.fr = "Service d'assistance et boîte aux lettres partagée" -version = "1.8.109~ynh1" +version = "1.8.110~ynh1" maintainers = ["eric_G"] @@ -50,8 +50,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/freescout-helpdesk/freescout/archive/refs/tags/1.8.109.tar.gz" - sha256 = "2c508f2e8dcf9489d8d9b82da8cd5928168998dabc41e9450833364a60ae29b8" + url = "https://github.com/freescout-helpdesk/freescout/archive/refs/tags/1.8.110.tar.gz" + sha256 = "4a93958470f54a9e3af97159be96b315c467ff279f1aefd075f6098a117c8e7e" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 07f89f93e40fbe0a26ab9e45b88ae3752ed204ec Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 2 Dec 2023 16:16:04 +0000 Subject: [PATCH 2/5] 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 c0b2857..fd8cc50 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 FreeScout is the super lightweight and powerful free open source help desk and shared inbox built with PHP (Laravel framework). Now you can enjoy free Zendesk & Help Scout without giving up privacy or locking yourself into a service you don't control. -**Shipped version:** 1.8.109~ynh1 +**Shipped version:** 1.8.110~ynh1 **Demo:** https://demo.freescout.net/login diff --git a/README_fr.md b/README_fr.md index 724bad5..7400b81 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 FreeScout est un service d'assistance open source gratuit ultra léger et puissant et une boîte de réception partagée construite avec PHP (framework Laravel). Vous pouvez désormais profiter gratuitement de Zendesk et Help Scout sans renoncer à votre confidentialité ni vous enfermer dans un service que vous ne contrôlez pas. -**Version incluse :** 1.8.109~ynh1 +**Version incluse :** 1.8.110~ynh1 **Démo :** https://demo.freescout.net/login From 98e18ffd977ef7f87f7ba11f2f3a577fb6ce878d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 15 Dec 2023 17:16:20 +0100 Subject: [PATCH 3/5] Upgrade to v1.8.113 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index f3a7b4f..1436972 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "FreeScout" description.en = "Help desk & shared mailbox" description.fr = "Service d'assistance et boîte aux lettres partagée" -version = "1.8.110~ynh1" +version = "1.8.113~ynh1" maintainers = ["eric_G"] @@ -50,8 +50,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/freescout-helpdesk/freescout/archive/refs/tags/1.8.110.tar.gz" - sha256 = "4a93958470f54a9e3af97159be96b315c467ff279f1aefd075f6098a117c8e7e" + url = "https://github.com/freescout-helpdesk/freescout/archive/refs/tags/1.8.113.tar.gz" + sha256 = "09bed76c8655023da8f2f13eebd9e6217bfb705af24c90c2c7b957b7dc162e02" autoupdate.strategy = "latest_github_tag" [resources.system_user] From bd3f84bfc4e407790125b7f9fd078fca4c42f2b1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 15 Dec 2023 16:16:23 +0000 Subject: [PATCH 4/5] 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 fd8cc50..34e5930 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 FreeScout is the super lightweight and powerful free open source help desk and shared inbox built with PHP (Laravel framework). Now you can enjoy free Zendesk & Help Scout without giving up privacy or locking yourself into a service you don't control. -**Shipped version:** 1.8.110~ynh1 +**Shipped version:** 1.8.113~ynh1 **Demo:** https://demo.freescout.net/login diff --git a/README_fr.md b/README_fr.md index 7400b81..7a8b890 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 FreeScout est un service d'assistance open source gratuit ultra léger et puissant et une boîte de réception partagée construite avec PHP (framework Laravel). Vous pouvez désormais profiter gratuitement de Zendesk et Help Scout sans renoncer à votre confidentialité ni vous enfermer dans un service que vous ne contrôlez pas. -**Version incluse :** 1.8.110~ynh1 +**Version incluse :** 1.8.113~ynh1 **Démo :** https://demo.freescout.net/login From a8c8f2735df3c8454c586f12e69a90ab5fadc900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 15 Dec 2023 20:09:45 +0100 Subject: [PATCH 5/5] fix --- scripts/change_url | 7 ++++++- scripts/install | 3 --- scripts/restore | 1 - scripts/upgrade | 2 -- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index a264702..2e7a21c 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,6 +9,7 @@ source _common.sh source /usr/share/yunohost/helpers + #================================================= # MODIFY URL IN NGINX CONF #================================================= @@ -21,7 +22,11 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_replace_string --match_string="APP_URL=https://*" --replace_string="APP_URL=https://$new_domain" --target_file=$install_dir/.env +ynh_replace_string --match_string="APP_URL=https://$old_domain" --replace_string="APP_URL=https://$new_domain" --target_file=$install_dir/.env + +pushd $install_dir + php$phpversion artisan freescout:clear-cache +popd #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index bb8db37..57e8e48 100755 --- a/scripts/install +++ b/scripts/install @@ -21,7 +21,6 @@ timezone=$(cat /etc/timezone) #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -# Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" chmod -R o-rwx "$install_dir" @@ -36,10 +35,8 @@ find $install_dir -type d -exec chmod 775 {} \; #================================================= ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 -# Create a dedicated PHP-FPM config using the conf/php-fpm.conf or conf/extra_php-fpm.conf ynh_add_fpm_config -# Create a dedicated NGINX config using the conf/nginx.conf template ynh_add_nginx_config ynh_add_config --template="cron" --destination="/etc/cron.d/$app" diff --git a/scripts/restore b/scripts/restore index 4619525..79137eb 100755 --- a/scripts/restore +++ b/scripts/restore @@ -47,7 +47,6 @@ ynh_restore_file --origin_path="/etc/cron.d/$app" #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 -# Typically you only have either $app or php-fpm but not both at the same time... ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index ffd974b..74b6409 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -13,7 +13,6 @@ email=$(ynh_user_get_info --username=$admin --key=mail) firstname=$(ynh_user_get_info --username=$admin --key=firstname) lastname=$(ynh_user_get_info --username=$admin --key=lastname) - upgrade_type=$(ynh_check_app_version_changed) #================================================= @@ -28,7 +27,6 @@ then ynh_secure_remove --file="/$install_dir/vendor" - # Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" #--keep='.env' fi