From 2c4e5cf3242113d027d2367a5afd82181fe02578 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Sun, 2 Jul 2023 21:47:12 +0200 Subject: [PATCH] SubModule php-fpm: Relocated setup of php repo Relocated it from generic CoreModule to the php-fpm SubModule --- CoreModules/generic/preconf.sh | 6 ------ SubModules/php-fpm/preconf.sh | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CoreModules/generic/preconf.sh b/CoreModules/generic/preconf.sh index 3ad157a..2c3d5db 100644 --- a/CoreModules/generic/preconf.sh +++ b/CoreModules/generic/preconf.sh @@ -68,12 +68,6 @@ fi curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1 -##--------------## -# Repositories # -##--------------## -curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=php osrel=$shortdist bash > $OUTPUT 2>&1 - - ##------------## # System # ##------------## diff --git a/SubModules/php-fpm/preconf.sh b/SubModules/php-fpm/preconf.sh index 9ead4d7..1be790a 100644 --- a/SubModules/php-fpm/preconf.sh +++ b/SubModules/php-fpm/preconf.sh @@ -1,3 +1,6 @@ +#Setting up repository +curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=php osrel=$shortdist bash > $OUTPUT 2>&1 + if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] || [ "$shortdist" = "deb12" ] ; then # Debian/Ubunbtu Php variables phpPoolDir=/etc/php/${phpver}/fpm/pool.d