From 74ba12cc961f4ae9f2ef25731f44fdd39c5ba22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 29 Feb 2024 18:43:56 +0100 Subject: [PATCH 1/5] fix admin email --- conf/config.php | 2 +- manifest.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.php b/conf/config.php index 2b02c5e..c42746c 100644 --- a/conf/config.php +++ b/conf/config.php @@ -26,7 +26,7 @@ const APP_URL = '__DOMAIN__'; const NOMAPPLICATION = 'OpenSondage'; // Database administrator email -const ADRESSEMAILADMIN = '__EMAIL__'; +const ADRESSEMAILADMIN = '__ADMIN__@__DOMAIN__'; // Email for automatic responses (you should set it to "no-reply") const ADRESSEMAILREPONSEAUTO = ''; diff --git a/manifest.toml b/manifest.toml index 4697467..c01f898 100644 --- a/manifest.toml +++ b/manifest.toml @@ -6,7 +6,7 @@ description.en = "Service for planning an appointment or making a decision quick description.fr = "Service pour planifier un rendez-vous ou prendre une décision rapidement et facilement" description.de = "Service zur schnellen und einfachen Planung eines Termins oder zur Entscheidungsfindung" -version = "1.1.19~ynh2" +version = "1.1.19~ynh3" maintainers = [] From 98f437e8b18c045198af71d15ead778ddadb92b7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 29 Feb 2024 17:44:02 +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 e2d7d6d..e24811d 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in OpenSondage is a quick and easy-to-use online service to collaboratively plan and schedule the date and time for an appointment, meeting or other event. No registration is required. -**Shipped version:** 1.1.19~ynh2 +**Shipped version:** 1.1.19~ynh3 **Demo:** https://framadate.org/ diff --git a/README_fr.md b/README_fr.md index f29329b..822535c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po OpenSondage est un service en ligne rapide et facile à utiliser pour planifier et programmer de manière collaborative la date et l'heure d'un rendez-vous, d'une réunion ou d'un autre événement. Aucune inscription n'est requise. -**Version incluse :** 1.1.19~ynh2 +**Version incluse :** 1.1.19~ynh3 **Démo :** https://framadate.org/ From 3ff7bc4f652e62ead2862e751ae747e3a5ba76a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 29 Feb 2024 18:47:11 +0100 Subject: [PATCH 3/5] move logo to sources folder --- scripts/install | 2 +- scripts/upgrade | 2 +- {conf => sources}/logo.png | Bin 3 files changed, 2 insertions(+), 2 deletions(-) rename {conf => sources}/logo.png (100%) diff --git a/scripts/install b/scripts/install index 74dc8ef..ec5e26f 100644 --- a/scripts/install +++ b/scripts/install @@ -54,7 +54,7 @@ chown $app:$app "$install_dir/app/inc/config.php" # REPLACE LOGO IMAGE (DEFAULT IS FRAMADATE) #================================================= -cp ../conf/logo.png "$install_dir/images" +cp ../sources/logo.png "$install_dir/images" #================================================= # CREATE LOG FILE diff --git a/scripts/upgrade b/scripts/upgrade index 87b8d5e..d10108c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,7 +51,7 @@ chown $app:$app "$install_dir/app/inc/config.php" # REPLACE LOGO IMAGE (DEFAULT IS FRAMADATE) #================================================= -cp ../conf/logo.png "$install_dir/images" +cp ../sources/logo.png "$install_dir/images" #================================================= # CREATE LOG FILE diff --git a/conf/logo.png b/sources/logo.png similarity index 100% rename from conf/logo.png rename to sources/logo.png From 7eb9c54f625f9d6c4ddc0b406789da48b6e18cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 29 Feb 2024 18:47:40 +0100 Subject: [PATCH 4/5] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index c01f898..cbbb657 100644 --- a/manifest.toml +++ b/manifest.toml @@ -68,7 +68,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, php8.0-mbstring, php8.0-intl, php8.0-xml, php8.0-cli, php8.0-mysql" + packages = "mariadb-server, php8.2-mbstring, php8.2-intl, php8.2-xml, php8.2-cli, php8.2-mysql" [resources.database] type = "mysql" From eb2ccac4508fc4d8f3d65de656f30b0e26315732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 29 Feb 2024 18:48:47 +0100 Subject: [PATCH 5/5] Update change_url --- scripts/change_url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index 300afc7..161c1a0 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -23,7 +23,7 @@ ynh_change_url_nginx_config #================================================= # UPDATE OPENSONDAGE CONFIGURATION #================================================= -ynh_script_progression --message="Reconfiguring $app..." +ynh_script_progression --message="Reconfiguring $app..." --weight=2 ynh_replace_string --match_string="const APP_URL = '$old_domain';" --replace_string="const APP_URL = '$new_domain';" --target_file="$install_dir/app/inc/config.php"