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

Merge pull request #31 from yalh76/yuno_3.5

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
manifest.json
View file

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

5
scripts/install
View file

@ -111,11 +111,6 @@ 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"
#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 # INSTALL PHP DEPENDENCIES
#================================================= #=================================================

5
scripts/remove
View file

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

12
scripts/upgrade
View file

@ -121,21 +121,9 @@ ynh_system_user_create "$app"
#================================================= #=================================================
ynh_print_info "Upgrading php-fpm configuration..." 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 # Create a dedicated php-fpm config
ynh_add_fpm_config --phpversion="7.2" 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 # SPECIFIC UPGRADE
#================================================= #=================================================