From 13e7c57c74ab052cd7ed08c3cb259ced3fa7b8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 28 May 2024 13:18:20 +0200 Subject: [PATCH] Fix upgrade on bookworm: call the correct php version --- manifest.toml | 15 +++++++++++++-- scripts/upgrade | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index e40469f..f1ff893 100644 --- a/manifest.toml +++ b/manifest.toml @@ -48,9 +48,20 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" main.allowed = "visitors" # should it always be public ? - + # FIXME: watdo with this ... #REMOVEME? ynh_permission_create --permission="autodiscover" --url="re:$domain_regex/[Aa]uto[Dd]iscover/.*" --allowed="visitors" --show_tile="false" --protected="true" [resources.apt] - packages = "php7.4-soap, php7.4-imap, php7.4-xsl, php7.4-curl, php7.4-xml, php7.4-ldap, php7.4-cli, php7.4-mbstring, php7.4-memcached, libawl-php" + packages = [ + "php7.4-soap", + "php7.4-imap", + "php7.4-xsl", + "php7.4-curl", + "php7.4-xml", + "php7.4-ldap", + "php7.4-cli", + "php7.4-mbstring", + "php7.4-memcached", + "libawl-php", + ] diff --git a/scripts/upgrade b/scripts/upgrade index d148951..1de9596 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -134,7 +134,7 @@ else backend="BackendIMAP" imap_server="$domain" imap_meeting_use_caldav="false" - + ynh_add_config --template="backend/config-imap.php" --destination="$install_dir/backend/imap/config.php" fi @@ -144,7 +144,7 @@ ynh_add_config --template="backend/config-autodiscover.php" --destination="$inst ynh_add_config --template="backend/config-searchldap.php" --destination="$install_dir/backend/searchldap/config.php" # Fixstates to avoid full resync of devices after version upgrades -$install_dir/z-push-admin.php -a fixstates +"php$phpversion" "$install_dir/z-push-admin.php" -a fixstates #================================================= # END OF SCRIPT