mirror of
https://github.com/YunoHost-Apps/pixelfed_ynh.git
synced 2024-09-03 20:06:04 +02:00
Merge pull request #14 from yalh76/testing
Fix install and package_check
This commit is contained in:
commit
05878c76f5
3 changed files with 14 additions and 12 deletions
|
@ -8,7 +8,7 @@
|
||||||
pkg_dependencies="php7.2-pgsql php7.2-mbstring php7.2-bcmath php7.2-simplexml php7.2-curl postgresql redis-server \
|
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 \
|
php7.2-intl php7.2-exif \
|
||||||
libfreetype6 libjpeg62-turbo libpng16-16 libxpm4 libvpx4 libwebp6 libmagickwand-6.q16-3 \
|
libfreetype6 libjpeg62-turbo libpng16-16 libxpm4 libvpx4 libwebp6 libmagickwand-6.q16-3 \
|
||||||
php7.2-imagick imagick \
|
php7.2-gd \
|
||||||
pngquant jpegoptim gifsicle"
|
pngquant jpegoptim gifsicle"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -349,7 +349,7 @@ ynh_install_extra_repo () {
|
||||||
else
|
else
|
||||||
local key_ext=gpg
|
local key_ext=gpg
|
||||||
fi
|
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
|
fi
|
||||||
|
|
||||||
# Update the list of package with the new repo
|
# Update the list of package with the new repo
|
||||||
|
|
|
@ -108,6 +108,7 @@ ynh_add_fpm_config --phpversion="7.2"
|
||||||
|
|
||||||
#Ugly move waiting 'ynh_add_fpm_config --phpversion='' released
|
#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"
|
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
|
systemctl reload php7.2-fpm
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
@ -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
|
# Remove a database if it exists, along with the associated user
|
||||||
ynh_psql_remove_db "$db_user" "$db_name"
|
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
|
# REMOVE PHP-FPM CONFIGURATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -42,6 +50,7 @@ ynh_print_info "Removing php-fpm configuration"
|
||||||
#Ugly move waiting 'ynh_add_fpm_config --phpversion='' released
|
#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"
|
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.2-fpm
|
||||||
|
systemctl reload php7.0-fpm
|
||||||
|
|
||||||
# Remove the dedicated php-fpm config
|
# Remove the dedicated php-fpm config
|
||||||
ynh_remove_fpm_config
|
ynh_remove_fpm_config
|
||||||
|
@ -52,8 +61,8 @@ ynh_remove_fpm_config
|
||||||
ynh_print_info "Removing dependencies"
|
ynh_print_info "Removing dependencies"
|
||||||
|
|
||||||
# Remove metapackage and its dependencies
|
# Remove metapackage and its dependencies
|
||||||
ynh_remove_php
|
|
||||||
ynh_remove_app_dependencies
|
ynh_remove_app_dependencies
|
||||||
|
ynh_remove_php
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# REMOVE APP MAIN DIR
|
# REMOVE APP MAIN DIR
|
||||||
|
@ -63,14 +72,6 @@ ynh_print_info "Removing app main directory"
|
||||||
# Remove the app directory securely
|
# Remove the app directory securely
|
||||||
ynh_secure_remove "$final_path"
|
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
|
# GENERIC FINALIZATION
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
Loading…
Add table
Reference in a new issue