Compare commits

..

No commits in common. "e090a061a93b267db6cb92ab27b15941bcea009d" and "882a4e7193447370de075fa7831ceaf39cb41ad6" have entirely different histories.

2 changed files with 2 additions and 31 deletions

View File

@ -110,8 +110,7 @@ vars:
"pkgs" slist => { "pkgs" slist => {
"httpd", "httpd",
"mod_ssl", "mod_ssl",
"mod_dav_svn", "mod_dav_svn"
"mod_fcgid"
}; };
fedora:: fedora::
"pkgs" slist => { "pkgs" slist => {
@ -148,8 +147,6 @@ vars:
# {m: "php",f:"libphp8"}, # {m: "php",f:"libphp8"},
centos:: centos::
"modules" data => '[ "modules" data => '[
{m:"proxy",f:"mod_proxy"},
{m:"proxy_fcgi",f:"mod_proxy_fcgi"},
{m: "autoindex",f:"mod_autoindex"}, {m: "autoindex",f:"mod_autoindex"},
{m: "log_config",f:"mod_log_config"}, {m: "log_config",f:"mod_log_config"},
{m: "version",f:"mod_version"}, {m: "version",f:"mod_version"},

28
php.cf
View File

@ -7,10 +7,7 @@ bundle agent install_php
classes: classes:
"php_install_repo" expression => not(fileexists("/etc/apt/sources.list.d/php.list")); "php_install_repo" expression => not(fileexists("/etc/apt/sources.list.d/php.list"));
vars: vars:
"version" string => "$(php.version)"; "version" string => "$(php.version)";
centos::
"version" string => "";
freebsd:: freebsd::
@ -63,23 +60,6 @@ vars:
"php-gd", "php-gd",
}; };
centos::
"pkgs" slist => {
"php$(version)-cli",
"php$(version)-common",
"php$(version)-pecl-zip",
"php$(version)-pgsql",
"php$(version)-mysqlnd",
"php$(version)-xml",
"php$(version)-gd",
"php$(version)-mbstring",
"php$(version)-intl",
"php$(version)-pecl-imagick",
"php$(version)-ldap",
"php-pecl-json-post"
};
# "php$(version)-curl",
commands: commands:
# (debian|ubuntu)&php_install_repo:: # (debian|ubuntu)&php_install_repo::
@ -146,12 +126,6 @@ vars:
"apache_m" string => "php"; "apache_m" string => "php";
"apache_f" string => "libphp"; "apache_f" string => "libphp";
centos::
"version" string => "";
"fpm_pkgs" slist => { "php$(version)-fpm" };
"fpm_service_name" string => "php$(version)-fpm";
"fpm_socket" string => "/run/php-fpm/www.sock";
files: files:
"$(ini_files)" "$(ini_files)"