diff --git a/scripts/_common.sh b/scripts/_common.sh index cf0fed16..8e0bc493 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,7 +8,7 @@ pkg_dependencies="php7.2-pgsql php7.2-mbstring php7.2-bcmath php7.2-simplexml php7.2-curl postgresql redis-server \ php7.2-intl php7.2-exif \ libfreetype6 libjpeg62-turbo libpng16-16 libxpm4 libvpx4 libwebp6 libmagickwand-6.q16-3 \ -php7.2-imagick imagick \ +php7.2-gd \ pngquant jpegoptim gifsicle" #================================================= @@ -349,7 +349,7 @@ ynh_install_extra_repo () { else local key_ext=gpg fi - wget -q "$key" -O - | $wget_append /etc/apt/trusted.gpg.d/$name.$key_ext + wget -q "$key" -O - | gpg --dearmor | $wget_append /etc/apt/trusted.gpg.d/$name.$key_ext > /dev/null fi # Update the list of package with the new repo diff --git a/scripts/install b/scripts/install index 7b0c0a75..4c263969 100644 --- a/scripts/install +++ b/scripts/install @@ -108,6 +108,7 @@ ynh_add_fpm_config --phpversion="7.2" #Ugly move waiting 'ynh_add_fpm_config --phpversion='' released mv "/etc/php/7.0/fpm/pool.d/$app.conf" "/etc/php/7.2/fpm/pool.d/$app.conf" +systemctl reload php7.0-fpm systemctl reload php7.2-fpm #================================================= diff --git a/scripts/remove b/scripts/remove index 8fd30572..5784d04e 100644 --- a/scripts/remove +++ b/scripts/remove @@ -34,6 +34,14 @@ SELECT pg_terminate_backend (pg_stat_activity.pid) FROM pg_stat_activity WHERE p # Remove a database if it exists, along with the associated user ynh_psql_remove_db "$db_user" "$db_name" +#================================================= +# REMOVE NGINX CONFIGURATION +#================================================= +ynh_print_info "Removing nginx web server configuration" + +# Remove the dedicated nginx config +ynh_remove_nginx_config + #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= @@ -42,6 +50,7 @@ ynh_print_info "Removing php-fpm configuration" #Ugly move waiting 'ynh_add_fpm_config --phpversion='' released mv "/etc/php/7.2/fpm/pool.d/$app.conf" "/etc/php/7.0/fpm/pool.d/$app.conf" systemctl reload php7.2-fpm +systemctl reload php7.0-fpm # Remove the dedicated php-fpm config ynh_remove_fpm_config @@ -52,8 +61,8 @@ ynh_remove_fpm_config ynh_print_info "Removing dependencies" # Remove metapackage and its dependencies -ynh_remove_php ynh_remove_app_dependencies +ynh_remove_php #================================================= # REMOVE APP MAIN DIR @@ -63,14 +72,6 @@ ynh_print_info "Removing app main directory" # Remove the app directory securely ynh_secure_remove "$final_path" -#================================================= -# REMOVE NGINX CONFIGURATION -#================================================= -ynh_print_info "Removing nginx web server configuration" - -# Remove the dedicated nginx config -ynh_remove_nginx_config - #================================================= # GENERIC FINALIZATION #================================================= @@ -85,4 +86,4 @@ ynh_system_user_delete "$app" # END OF SCRIPT #================================================= -ynh_print_info "Removal of $app completed" \ No newline at end of file +ynh_print_info "Removal of $app completed"