From 926e636c11c98c57e38a1b3daef95803ae0dcfe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 10 Jun 2019 13:00:16 +0300 Subject: [PATCH] =?UTF-8?q?dev-lang/php:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B9=D0=BA=D0=B0=20fpm-php=207.1,7.2,7.3=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=B2=D0=B7=D0=B0=D0=BD=D0=B8=D0=BC=D0=BE=D0=B4=D0=B5=D0=B9?= =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=B8=D1=8F=20=D1=81=20Nginx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.6/2_ac_install_merge/Depends/nginx | 1 + .../dev-lang/php/.calculate_directory | 1 + .../php/fpm-php7.1/.calculate_directory | 1 + .../dev-lang/php/fpm-php7.1/fpm.d/www.conf | 17 +++++++++++++++++ .../dev-lang/php/fpm-php7.1/php.ini | 9 +++++++++ .../php/fpm-php7.2/.calculate_directory | 1 + .../dev-lang/php/fpm-php7.2/fpm.d/www.conf | 17 +++++++++++++++++ .../dev-lang/php/fpm-php7.2/php.ini | 9 +++++++++ .../php/fpm-php7.3/.calculate_directory | 1 + .../dev-lang/php/fpm-php7.3/fpm.d/www.conf | 17 +++++++++++++++++ .../dev-lang/php/fpm-php7.3/php.ini | 9 +++++++++ 11 files changed, 83 insertions(+) create mode 100644 profiles/templates/3.6/2_ac_install_merge/Depends/nginx create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-lang/php/.calculate_directory create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/.calculate_directory create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/fpm.d/www.conf create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/php.ini create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/.calculate_directory create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/fpm.d/www.conf create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/php.ini create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/.calculate_directory create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/fpm.d/www.conf create mode 100644 profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/php.ini diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/nginx b/profiles/templates/3.6/2_ac_install_merge/Depends/nginx new file mode 100644 index 000000000..17d256735 --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/Depends/nginx @@ -0,0 +1 @@ +# Calculate append=skip merge(www-servers/nginx)!= merge=dev-lang/php diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/.calculate_directory new file mode 100644 index 000000000..8969b0a35 --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/.calculate_directory @@ -0,0 +1 @@ +# Calculate mergepkg()!=&&pkg(www-servers/nginx)!= path=/etc diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/.calculate_directory new file mode 100644 index 000000000..989465ec8 --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/.calculate_directory @@ -0,0 +1 @@ +# Calculate mergepkg(dev-lang/php:7.1)!= diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/fpm.d/www.conf b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/fpm.d/www.conf new file mode 100644 index 000000000..08d3b1cbf --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/fpm.d/www.conf @@ -0,0 +1,17 @@ +# Calculate multiline format=diff +^;?(user)\s*=.* +\1 = nginx +^;?(group)\s*=.* +\1 = nginx +^;?(listen)\s*=.* +\1 = /run/php-fpm.socket +^;?(listen\.owner)\s*=.* +\1 = nginx +^;?(listen\.group)\s*=.* +\1 = nginx +^;?(pm.max_children)\s*=.* +\1 = 20 +^;env +env +^(env\[PATH\])\s*=.* +\1 = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/php.ini b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/php.ini new file mode 100644 index 000000000..87f645a66 --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.1/php.ini @@ -0,0 +1,9 @@ +# Calculate format=patch +;?(cgi.fix_pathinfo)\s*=.* +\1=0 +;?(date\.timezone)\s*=.* +\1="Europe/Moscow" +;?(opcache\.enable_cli)\s*=.* +\1=1 +;?(opcache\.revalidate_freq)\s*=.* +\1=1 diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/.calculate_directory new file mode 100644 index 000000000..a2a28e137 --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/.calculate_directory @@ -0,0 +1 @@ +# Calculate mergepkg(dev-lang/php:7.2)!= diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/fpm.d/www.conf b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/fpm.d/www.conf new file mode 100644 index 000000000..08d3b1cbf --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/fpm.d/www.conf @@ -0,0 +1,17 @@ +# Calculate multiline format=diff +^;?(user)\s*=.* +\1 = nginx +^;?(group)\s*=.* +\1 = nginx +^;?(listen)\s*=.* +\1 = /run/php-fpm.socket +^;?(listen\.owner)\s*=.* +\1 = nginx +^;?(listen\.group)\s*=.* +\1 = nginx +^;?(pm.max_children)\s*=.* +\1 = 20 +^;env +env +^(env\[PATH\])\s*=.* +\1 = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/php.ini b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/php.ini new file mode 100644 index 000000000..87f645a66 --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.2/php.ini @@ -0,0 +1,9 @@ +# Calculate format=patch +;?(cgi.fix_pathinfo)\s*=.* +\1=0 +;?(date\.timezone)\s*=.* +\1="Europe/Moscow" +;?(opcache\.enable_cli)\s*=.* +\1=1 +;?(opcache\.revalidate_freq)\s*=.* +\1=1 diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/.calculate_directory new file mode 100644 index 000000000..b503ba647 --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/.calculate_directory @@ -0,0 +1 @@ +# Calculate mergepkg(dev-lang/php:7.3)!= diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/fpm.d/www.conf b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/fpm.d/www.conf new file mode 100644 index 000000000..08d3b1cbf --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/fpm.d/www.conf @@ -0,0 +1,17 @@ +# Calculate multiline format=diff +^;?(user)\s*=.* +\1 = nginx +^;?(group)\s*=.* +\1 = nginx +^;?(listen)\s*=.* +\1 = /run/php-fpm.socket +^;?(listen\.owner)\s*=.* +\1 = nginx +^;?(listen\.group)\s*=.* +\1 = nginx +^;?(pm.max_children)\s*=.* +\1 = 20 +^;env +env +^(env\[PATH\])\s*=.* +\1 = /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/php.ini b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/php.ini new file mode 100644 index 000000000..87f645a66 --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/dev-lang/php/fpm-php7.3/php.ini @@ -0,0 +1,9 @@ +# Calculate format=patch +;?(cgi.fix_pathinfo)\s*=.* +\1=0 +;?(date\.timezone)\s*=.* +\1="Europe/Moscow" +;?(opcache\.enable_cli)\s*=.* +\1=1 +;?(opcache\.revalidate_freq)\s*=.* +\1=1