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

Merge pull request #31 from yalh76/yuno_3.5

Remove ugly move needed before yunohost 3.5.2
This commit is contained in:
Jean-Baptiste 2019-04-11 15:14:22 +02:00 committed by GitHub
commit aadf8c8c26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 24 deletions

View file

@ -5,7 +5,7 @@
"description": {
"en": "ActivityPub Federated Image Sharing"
},
"version": "0.8.6~ynh1",
"version": "0.8.6~ynh2",
"url": "https://pixelfed.org/",
"license": "AGPL-3.0-or-later",
"maintainer": {
@ -13,7 +13,7 @@
"email": "jean-baptiste@holcroft.fr"
},
"requirements": {
"yunohost": ">= 3.4"
"yunohost": ">= 3.5"
},
"multi_instance": true,
"services": [

View file

@ -111,11 +111,6 @@ ynh_print_info "Configuring php-fpm..."
# Create a dedicated php-fpm config
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
#=================================================
# INSTALL PHP DEPENDENCIES
#=================================================

View file

@ -47,11 +47,6 @@ ynh_remove_nginx_config
#=================================================
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

View file

@ -121,21 +121,9 @@ ynh_system_user_create "$app"
#=================================================
ynh_print_info "Upgrading php-fpm configuration..."
#Ugly move waiting 'ynh_add_fpm_config --phpversion='' released
mv -f "/etc/php/7.2/fpm/pool.d/$app.conf" "/etc/php/7.0/fpm/pool.d/$app.conf"
sleep 5
systemctl reload php7.2-fpm
systemctl reload php7.0-fpm
# Create a dedicated php-fpm config
ynh_add_fpm_config --phpversion="7.2"
#Ugly move waiting 'ynh_add_fpm_config --phpversion='' released
mv -f "/etc/php/7.0/fpm/pool.d/$app.conf" "/etc/php/7.2/fpm/pool.d/$app.conf"
sleep 5
systemctl reload php7.0-fpm
systemctl reload php7.2-fpm
#=================================================
# SPECIFIC UPGRADE
#=================================================