YunoHost-Apps/my_webapp_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/my_webapp_ynh.git synced 2024-09-03 19:46:26 +02:00
Code Issues Activity Actions

Merge pull request #130 from fflorent/patch-1

Browse source 
Remove dependencies and reinstall them when changing php version
This commit is contained in:
Alexandre Aubin 2024-01-22 17:36:48 +01:00 • committed by GitHub
commit 7d592faabe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
manifest.toml
View file

@ -70,15 +70,15 @@ ram.runtime = "50M"
[resources.apt] [resources.apt]
packages = "nginx" # Kind of "dummy" value to be sure to have a non-empty dep list packages = "nginx" # Kind of "dummy" value to be sure to have a non-empty dep list
packages_from_raw_bash = """ packages_from_raw_bash = """
if [[ "$database" == "mysql" ]]; then if [[ "$database" == "mysql" ]]; then
echo "mariadb-server" echo "mariadb-server"
if [[ "$phpversion" != none ]]; then if [[ "$phpversion" != none ]]; then
echo "php${phpversion}-mysql" echo "php${phpversion}-mysql"
fi fi
elif [[ "$database" == "postgresql" ]]; then elif [[ "$database" == "postgresql" ]]; then
echo "postgresql postgresql-contrib" echo "postgresql postgresql-contrib"
if [[ "$phpversion" != none ]]; then if [[ "$phpversion" != none ]]; then
echo "php${phpversion}-pgsql" echo "php${phpversion}-pgsql"
fi fi

7
scripts/config
View file

@ -114,7 +114,7 @@ ynh_app_config_apply() {
then then
ynh_app_setting_set --app=$app --key=phpversion --value="${old[phpversion]}" ynh_app_setting_set --app=$app --key=phpversion --value="${old[phpversion]}"
ynh_remove_fpm_config ynh_remove_fpm_config
# ^ the helper includes ynh_remove_app_dependencies ynh_remove_app_dependencies
YNH_PHP_VERSION=$phpversion YNH_PHP_VERSION=$phpversion
# ^ ynh_add_config replaces __PHPVERSION__ by __PHP_YNH_VERSION__... # ^ ynh_add_config replaces __PHPVERSION__ by __PHP_YNH_VERSION__...
ynh_app_setting_set --app=$app --key=phpversion --value="$phpversion" ynh_app_setting_set --app=$app --key=phpversion --value="$phpversion"
@ -127,7 +127,10 @@ ynh_app_config_apply() {
ynh_secure_remove --file="$nginx_extra_conf_dir/php.conf" ynh_secure_remove --file="$nginx_extra_conf_dir/php.conf"
else else
ynh_add_config --template="nginx-php.conf" --destination="$nginx_extra_conf_dir/php.conf" ynh_add_config --template="nginx-php.conf" --destination="$nginx_extra_conf_dir/php.conf"
ynh_install_app_dependencies "php${phpversion}-fpm" database=$(ynh_app_setting_get --app=$app --key=database)
dependencies="$(ynh_read_manifest -k "resources.apt.packages")"
dependencies_from_raw_bash=$(eval "$(ynh_read_manifest -k "resources.apt.packages_from_raw_bash")" | tr "\n" " ")
ynh_install_app_dependencies "$dependencies $dependencies_from_raw_bash"
ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
# ^ the helper takes care of ynh_app_setting_set the phpversion # ^ the helper takes care of ynh_app_setting_set the phpversion
fi fi