YunoHost-Apps/pixelfed_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00
Code Issues Activity Actions

Revert "fix php-fpm"

Browse source 
This reverts commit ec26cf58e1.
This commit is contained in:
yalh76 2019-04-01 06:12:43 +02:00
parent ec26cf58e1
commit bb89459f91
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/install
View file

@ -106,8 +106,9 @@ ynh_print_info "Configuring php-fpm..."
# Create a dedicated php-fpm config # Create a dedicated php-fpm config
ynh_add_fpm_config --phpversion="7.2" ynh_add_fpm_config --phpversion="7.2"
#Workaround waiting 'ynh_add_fpm_config --phpversion='' released #Ugly move waiting 'ynh_add_fpm_config --phpversion='' released
cp "/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
#================================================= #=================================================

9
scripts/remove
View file

@ -47,13 +47,14 @@ ynh_remove_nginx_config
#================================================= #=================================================
ynh_print_info "Removing php-fpm configuration" 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 # Remove the dedicated php-fpm config
ynh_remove_fpm_config ynh_remove_fpm_config
#Workaround waiting 'ynh_add_fpm_config --phpversion='' released
ynh_secure_remove "/etc/php/7.2/fpm/pool.d/$app.conf"
systemctl reload php7.2-fpm
#================================================= #=================================================
# REMOVE DEPENDENCIES # REMOVE DEPENDENCIES
#================================================= #=================================================

13
scripts/upgrade
View file

@ -116,11 +116,16 @@ ynh_system_user_create "$app"
#================================================= #=================================================
ynh_print_info "Upgrading php-fpm configuration..." ynh_print_info "Upgrading php-fpm configuration..."
mv -f "/etc/php/7.2/fpm/pool.d/$app.conf" "/etc/php/7.0/fpm/pool.d/$app.conf"
systemctl reload php7.0-fpm
systemctl reload php7.2-fpm
# Create a dedicated php-fpm config # Create a dedicated php-fpm config
ynh_add_fpm_config --phpversion="7.2" ynh_add_fpm_config --phpversion="7.2"
#Workaround waiting 'ynh_add_fpm_config --phpversion='' released #Ugly move waiting 'ynh_add_fpm_config --phpversion='' released
cp -f "/etc/php/7.0/fpm/pool.d/$app.conf" "/etc/php/7.2/fpm/pool.d/$app.conf" mv -f "/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
#================================================= #=================================================
@ -148,7 +153,9 @@ pushd "$final_path"
php7.2 artisan horizon:purge php7.2 artisan horizon:purge
popd popd
ynh_backup_if_checksum_is_different "$final_path/.env"
ynh_backup_if_checksum_is_different "$final_path/CONFIG_FILE"
# Recalculate and store the checksum of the file for the next upgrade. # Recalculate and store the checksum of the file for the next upgrade.
ynh_store_file_checksum "$final_path/.env" ynh_store_file_checksum "$final_path/.env"