Reinstall all the dependencies when changing php version #131
This commit is contained in:
parent
365d2c7641
commit
4801ff47a8
2 changed files with 7 additions and 4 deletions
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Add table
Reference in a new issue