From c5d70cc455a4fa367e207b3e337a387857b513e2 Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Wed, 16 Dec 2020 13:25:11 +0100 Subject: [PATCH] Updated php module to support mutiple php versions --- SubModules/php-fpm/apt.pkg.list | 1 - SubModules/php-fpm/dnf.pkg.list | 1 - SubModules/php-fpm/generic.pkg.list | 1 - SubModules/php-fpm/php7x/apt.php.pkg.list | 1 + SubModules/php-fpm/php7x/dnf.php.pkg.list | 1 + SubModules/php-fpm/php7x/generic.php.pkg.list | 1 + SubModules/php-fpm/php8x/apt.php.pkg.list | 1 + SubModules/php-fpm/php8x/dnf.php.pkg.list | 1 + SubModules/php-fpm/php8x/generic.php.pkg.list | 1 + SubModules/php-fpm/preconf.sh | 19 ++++++++++++++++++- installer.sh | 2 +- 11 files changed, 25 insertions(+), 5 deletions(-) delete mode 100644 SubModules/php-fpm/apt.pkg.list delete mode 100644 SubModules/php-fpm/dnf.pkg.list delete mode 100644 SubModules/php-fpm/generic.pkg.list create mode 100644 SubModules/php-fpm/php7x/apt.php.pkg.list create mode 100644 SubModules/php-fpm/php7x/dnf.php.pkg.list create mode 100644 SubModules/php-fpm/php7x/generic.php.pkg.list create mode 100644 SubModules/php-fpm/php8x/apt.php.pkg.list create mode 100644 SubModules/php-fpm/php8x/dnf.php.pkg.list create mode 100644 SubModules/php-fpm/php8x/generic.php.pkg.list diff --git a/SubModules/php-fpm/apt.pkg.list b/SubModules/php-fpm/apt.pkg.list deleted file mode 100644 index 7521d75..0000000 --- a/SubModules/php-fpm/apt.pkg.list +++ /dev/null @@ -1 +0,0 @@ -php-pear \ No newline at end of file diff --git a/SubModules/php-fpm/dnf.pkg.list b/SubModules/php-fpm/dnf.pkg.list deleted file mode 100644 index 8ccb20f..0000000 --- a/SubModules/php-fpm/dnf.pkg.list +++ /dev/null @@ -1 +0,0 @@ -PHPprefix-pear PHPprefix \ No newline at end of file diff --git a/SubModules/php-fpm/generic.pkg.list b/SubModules/php-fpm/generic.pkg.list deleted file mode 100644 index 40d3c6b..0000000 --- a/SubModules/php-fpm/generic.pkg.list +++ /dev/null @@ -1 +0,0 @@ -PHPprefix-imagick PHPprefix-cli PHPprefix-apcu PHPprefix-fpm PHPprefix-mysql PHPprefix-cgi PHPprefix-common PHPprefix-mbstring PHPprefix-curl PHPprefix-gd PHPprefix-intl PHPprefix-soap PHPprefix-xml PHPprefix-xmlrpc PHPprefix-zip \ No newline at end of file diff --git a/SubModules/php-fpm/php7x/apt.php.pkg.list b/SubModules/php-fpm/php7x/apt.php.pkg.list new file mode 100644 index 0000000..eee9257 --- /dev/null +++ b/SubModules/php-fpm/php7x/apt.php.pkg.list @@ -0,0 +1 @@ +php-pear PHPprefix-mysql \ No newline at end of file diff --git a/SubModules/php-fpm/php7x/dnf.php.pkg.list b/SubModules/php-fpm/php7x/dnf.php.pkg.list new file mode 100644 index 0000000..3216834 --- /dev/null +++ b/SubModules/php-fpm/php7x/dnf.php.pkg.list @@ -0,0 +1 @@ +PHPprefix-pear PHPprefix PHPprefix-mysqlnd \ No newline at end of file diff --git a/SubModules/php-fpm/php7x/generic.php.pkg.list b/SubModules/php-fpm/php7x/generic.php.pkg.list new file mode 100644 index 0000000..9ad1d8c --- /dev/null +++ b/SubModules/php-fpm/php7x/generic.php.pkg.list @@ -0,0 +1 @@ +PHPprefix-imagick PHPprefix-cli PHPprefix-apcu PHPprefix-fpm PHPprefix-cgi PHPprefix-common PHPprefix-mbstring PHPprefix-curl PHPprefix-gd PHPprefix-intl PHPprefix-soap PHPprefix-xml PHPprefix-xmlrpc PHPprefix-zip \ No newline at end of file diff --git a/SubModules/php-fpm/php8x/apt.php.pkg.list b/SubModules/php-fpm/php8x/apt.php.pkg.list new file mode 100644 index 0000000..eee9257 --- /dev/null +++ b/SubModules/php-fpm/php8x/apt.php.pkg.list @@ -0,0 +1 @@ +php-pear PHPprefix-mysql \ No newline at end of file diff --git a/SubModules/php-fpm/php8x/dnf.php.pkg.list b/SubModules/php-fpm/php8x/dnf.php.pkg.list new file mode 100644 index 0000000..3216834 --- /dev/null +++ b/SubModules/php-fpm/php8x/dnf.php.pkg.list @@ -0,0 +1 @@ +PHPprefix-pear PHPprefix PHPprefix-mysqlnd \ No newline at end of file diff --git a/SubModules/php-fpm/php8x/generic.php.pkg.list b/SubModules/php-fpm/php8x/generic.php.pkg.list new file mode 100644 index 0000000..b32f2bb --- /dev/null +++ b/SubModules/php-fpm/php8x/generic.php.pkg.list @@ -0,0 +1 @@ +PHPprefix-imagick PHPprefix-cli PHPprefix-apcu PHPprefix-fpm PHPprefix-cgi PHPprefix-common PHPprefix-mbstring PHPprefix-curl PHPprefix-gd PHPprefix-intl PHPprefix-soap PHPprefix-xml PHPprefix-zip \ No newline at end of file diff --git a/SubModules/php-fpm/preconf.sh b/SubModules/php-fpm/preconf.sh index 1085b2b..05225a2 100644 --- a/SubModules/php-fpm/preconf.sh +++ b/SubModules/php-fpm/preconf.sh @@ -15,8 +15,25 @@ elif [ "$shortdist" = "el8" ]; then mkdir -p /var/run/php fi +#Setting php version branch +if [ ${phpver//.} -ge 70 ] && [ ${phpver//.} -lt 80 ] ; then + phpVerBranch=7x +elif [ ${phpver//.} -ge 80 ] && [ ${phpver//.} -lt 90 ]; then + phpVerBranch=8x +fi + +#Getting php pkglist +if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/php-fpm/generic.php"$phpVerBranch".php.pkg.list; then + curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/php-fpm/generic.phppkg.list + printf " " >>/tmp/pkg.list +fi + +if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/SubModules/php-fpm/php"$phpVerBranch"/"$PKGLIST".php.pkg.list; then + curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/SubModules/php-fpm/"$PKGLIST".phppkg.list + printf " " >>/tmp/pkg.list +fi #Storing vars to config -for storeme in phpPoolDir phpPkgName phpMainConf phpFPMService; do +for storeme in phpPoolDir phpPkgName phpMainConf phpFPMService phpVerBranch; do declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/phpvar.list done \ No newline at end of file diff --git a/installer.sh b/installer.sh index 461aa2c..f39d02a 100644 --- a/installer.sh +++ b/installer.sh @@ -24,7 +24,7 @@ fi #Git-repo repo=https://git.ictmaatwerk.com/VPS-scripts/Web-V2 -branch=master +branch=PHP8-Testing branchtype=branch #=branch for branch and =tag for release #Installer-config phpver=7.4