From 735f0cc9ccae465b19e3b59e1e815084ebc60e89 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 4 Jan 2020 00:05:54 +0100 Subject: [PATCH 1/4] Update ynh_install_php__3 --- scripts/ynh_install_php__3 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/ynh_install_php__3 b/scripts/ynh_install_php__3 index 75bb6db..b5f7bda 100644 --- a/scripts/ynh_install_php__3 +++ b/scripts/ynh_install_php__3 @@ -37,8 +37,9 @@ ynh_install_php () { # Set php7.0 back as the default version for php-cli. update-alternatives --set php /usr/bin/php7.0 - # Remove this extra repository after packages are installed - ynh_remove_extra_repo --name=extra_php_version + # Pin this extra repository after packages are installed to prevent sury of doing shit + ynh_pin_repo --package="*" --pin="origin \"packages.sury.org\"" 200 --name=extra_php_version + ynh_pin_repo --package="php7.0*" --pin="origin \"packages.sury.org\"" 600 --name=extra_php_version $append # Advertise service in admin panel yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log" From 0e7c6deb4dfcc62798635aba6cddddabab03252a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 4 Jan 2020 00:06:15 +0100 Subject: [PATCH 2/4] Revert "Update ynh_install_php__3" This reverts commit 735f0cc9ccae465b19e3b59e1e815084ebc60e89. --- scripts/ynh_install_php__3 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/ynh_install_php__3 b/scripts/ynh_install_php__3 index b5f7bda..75bb6db 100644 --- a/scripts/ynh_install_php__3 +++ b/scripts/ynh_install_php__3 @@ -37,9 +37,8 @@ ynh_install_php () { # Set php7.0 back as the default version for php-cli. update-alternatives --set php /usr/bin/php7.0 - # Pin this extra repository after packages are installed to prevent sury of doing shit - ynh_pin_repo --package="*" --pin="origin \"packages.sury.org\"" 200 --name=extra_php_version - ynh_pin_repo --package="php7.0*" --pin="origin \"packages.sury.org\"" 600 --name=extra_php_version $append + # Remove this extra repository after packages are installed + ynh_remove_extra_repo --name=extra_php_version # Advertise service in admin panel yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log" From a23293508da2257c039d947b4c5e39d0a6d0b502 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 4 Jan 2020 00:08:11 +0100 Subject: [PATCH 3/4] Update ynh_install_php__3 --- scripts/ynh_install_php__3 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/ynh_install_php__3 b/scripts/ynh_install_php__3 index 75bb6db..b5f7bda 100644 --- a/scripts/ynh_install_php__3 +++ b/scripts/ynh_install_php__3 @@ -37,8 +37,9 @@ ynh_install_php () { # Set php7.0 back as the default version for php-cli. update-alternatives --set php /usr/bin/php7.0 - # Remove this extra repository after packages are installed - ynh_remove_extra_repo --name=extra_php_version + # Pin this extra repository after packages are installed to prevent sury of doing shit + ynh_pin_repo --package="*" --pin="origin \"packages.sury.org\"" 200 --name=extra_php_version + ynh_pin_repo --package="php7.0*" --pin="origin \"packages.sury.org\"" 600 --name=extra_php_version $append # Advertise service in admin panel yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log" From 27d774c61c288beb3f4a6d216047ee5d9e0d22a0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 4 Jan 2020 14:14:23 +0100 Subject: [PATCH 4/4] Update ynh_install_php__3 --- scripts/ynh_install_php__3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ynh_install_php__3 b/scripts/ynh_install_php__3 index b5f7bda..ca72f7f 100644 --- a/scripts/ynh_install_php__3 +++ b/scripts/ynh_install_php__3 @@ -39,7 +39,7 @@ ynh_install_php () { # Pin this extra repository after packages are installed to prevent sury of doing shit ynh_pin_repo --package="*" --pin="origin \"packages.sury.org\"" 200 --name=extra_php_version - ynh_pin_repo --package="php7.0*" --pin="origin \"packages.sury.org\"" 600 --name=extra_php_version $append + ynh_pin_repo --package="php7.0*" --pin="origin \"packages.sury.org\"" 600 --name=extra_php_version --append # Advertise service in admin panel yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log"