From 54a2010eacd3929122291a3598653f2fe0225035 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Mon, 15 Apr 2024 22:08:01 -0400 Subject: [PATCH] * Mon Apr 15 2024 Jean-Philippe Pialasse 11.0.0-7.sme - remove tar.xz from git --- .../templates.metadata/etc/opt/remi/php72/php-fpm.conf | 2 ++ .../etc/opt/remi/php72/php-fpm.d/custom.conf | 2 ++ .../etc/opt/remi/php72/php-fpm.d/ibays.conf | 2 ++ .../etc/opt/remi/php72/php-fpm.d/www.conf | 2 ++ .../etc/opt/remi/php72/sysconfig/php-fpm | 2 ++ smeserver-php.spec | 8 ++++---- 6 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf create mode 100644 root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf create mode 100644 root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/ibays.conf create mode 100644 root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf create mode 100644 root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm diff --git a/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf b/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf new file mode 100644 index 0000000..6ef2656 --- /dev/null +++ b/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.conf" +MORE_DATA={ PHP_VERSION => 72, FPM_POOL_DIR => "/etc/opt/remi/php72/php-fpm.d" } diff --git a/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf b/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf new file mode 100644 index 0000000..354a5d3 --- /dev/null +++ b/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/custom.conf" +MORE_DATA={ PHP_VERSION => 72 } diff --git a/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/ibays.conf b/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/ibays.conf new file mode 100644 index 0000000..3070ae9 --- /dev/null +++ b/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/ibays.conf @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/ibays.conf" +MORE_DATA={ PHP_VERSION => 72 } diff --git a/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf b/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf new file mode 100644 index 0000000..b8ee16a --- /dev/null +++ b/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/www.conf" +MORE_DATA={ PHP_VERSION => 72 } diff --git a/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm b/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm new file mode 100644 index 0000000..906cf41 --- /dev/null +++ b/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/sysconfig/php-fpm" +MORE_DATA={ PHP_VERSION => 72 } diff --git a/smeserver-php.spec b/smeserver-php.spec index ee11453..4e37b07 100644 --- a/smeserver-php.spec +++ b/smeserver-php.spec @@ -1,5 +1,5 @@ %define version 11.0.0 -%define release 6 +%define release 7 %define name smeserver-php %global debug_package %{nil} @@ -238,9 +238,9 @@ done for phpver in "72" "73" "74" "80" "81" "82" "83"; do #cp ph70 metada mkdir -p root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/ -cp -a root/etc/e-smith/templates.metadata/etc/opt/remi/php70/* root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/ +cp -a root/etc/e-smith/templates.metadata/etc/opt/remi/php72/* root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/ #sed inplace -find root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver -type f -print0 | xargs -0 sed -i 's/70/'$phpver'/g' +find root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver -type f -print0 | xargs -0 sed -i 's/72/'$phpver'/g' done # then patch the following files @@ -281,7 +281,7 @@ rm -rf $RPM_BUILD_ROOT %preun %changelog -* Mon Apr 15 2024 Jean-Philippe Pialasse 11.0.0-6.sme +* Mon Apr 15 2024 Jean-Philippe Pialasse 11.0.0-7.sme - remove tar.xz from git * Thu Apr 04 2024 Brian Read 11.0.0-5.sme