From 1931f3870e2321472dc655041406aa6fe95eb6bb Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 20 Jun 2023 15:40:07 -0600 Subject: [PATCH] Debian 11 if config.sh PHP version is set to 7.4 Then use the system repo instead of using sury. Use sury repo only when its needed. --- debian/resources/php.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/debian/resources/php.sh b/debian/resources/php.sh index d920348..9ed42a7 100755 --- a/debian/resources/php.sh +++ b/debian/resources/php.sh @@ -37,6 +37,7 @@ else #9.x - stretch #8.x - jessie apt-get -y install apt-transport-https lsb-release ca-certificates + if [ ."$os_codename" = ."jessie" ]; then wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' @@ -50,8 +51,16 @@ else sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' fi if [ ."$os_codename" = ."bullseye" ]; then - wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg - sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + if [ ."$php_version" = ."8.1" ]; then + /usr/bin/apt -y install apt-transport-https lsb-release ca-certificates curl wget gnupg2 + /usr/bin/wget -qO- https://packages.sury.org/php/apt.gpg | gpg --dearmor > /etc/apt/trusted.gpg.d/sury-php-8.x.gpg + /usr/bin/sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + fi + if [ ."$php_version" = ."8.2" ]; then + /usr/bin/apt -y install apt-transport-https lsb-release ca-certificates curl wget gnupg2 + /usr/bin/wget -qO- https://packages.sury.org/php/apt.gpg | gpg --dearmor > /etc/apt/trusted.gpg.d/sury-php-8.x.gpg + /usr/bin/sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' + fi fi fi apt-get update -y @@ -82,6 +91,9 @@ fi if [ ."$php_version" = ."8.1" ]; then apt-get install -y --no-install-recommends php8.1 php8.1-common php8.1-cli php8.1-dev php8.1-fpm php8.1-pgsql php8.1-sqlite3 php8.1-odbc php8.1-curl php8.1-imap php8.1-xml php8.1-gd php8.1-mbstring php8.1-ldap fi +if [ ."$php_version" = ."8.2" ]; then + apt-get install -y --no-install-recommends php8.2 php8.2-common php8.2-cli php8.2-dev php8.2-fpm php8.2-pgsql php8.2-sqlite3 php8.2-odbc php8.2-curl php8.2-imap php8.2-xml php8.2-gd php8.2-mbstring php8.2-ldap +fi #update config if source is being used if [ ."$php_version" = ."5" ]; then @@ -112,6 +124,10 @@ if [ ."$php_version" = ."8.1" ]; then verbose "version 8.1" php_ini_file='/etc/php/8.1/fpm/php.ini' fi +if [ ."$php_version" = ."8.2" ]; then + verbose "version 8.2" + php_ini_file='/etc/php/8.2/fpm/php.ini' +fi sed 's#post_max_size = .*#post_max_size = 80M#g' -i $php_ini_file sed 's#upload_max_filesize = .*#upload_max_filesize = 80M#g' -i $php_ini_file sed 's#;max_input_vars = .*#max_input_vars = 8000#g' -i $php_ini_file