diff --git a/php.cf b/php.cf index f500eb6..4188b3d 100644 --- a/php.cf +++ b/php.cf @@ -21,14 +21,26 @@ vars: "php$(php.bsdvs)-zip", "php$(php.bsdvs)-pgsql", "php$(php.bsdvs)-mysqli", - "php$(php.bsdvs)-pdo_mysql", - "php$(php.bsdvs)-pdo", "php$(php.bsdvs)-filter", "php$(php.bsdvs)-mbstring", "php$(php.bsdvs)-dom", "php$(php.bsdvs)-xml", "php$(php.bsdvs)-ctype", "php$(php.bsdvs)-intl", + "php$(php.bsdvs)-curl", + "php$(php.bsdvs)-fileinfo", + "php$(php.bsdvs)-exif", + "php$(php.bsdvs)-iconv", + "php$(php.bsdvs)-ldap", + "php$(php.bsdvs)-gd", + "php$(php.bsdvs)-pecl-imagick", + "php$(php.bsdvs)-pdo", + "php$(php.bsdvs)-pdo_sqlite", + "php$(php.bsdvs)-sqlite3", + "php$(php.bsdvs)-pdo_pgsql", + "php$(php.bsdvs)-pdo_mysql", + + }; # "php$(bsdvs)-json", @@ -110,7 +122,10 @@ methods: depends_on => {"php_repo_ready"}; commands: - + freebsd:: + "/usr/bin/true" + inform => "false", + handle => "php_repo_ready"; } @@ -171,6 +186,7 @@ vars: "fpm_pkgs" slist => { "php$(version)-fpm" }; "fpm_service_name" string => "php$(version)-fpm"; "fpm_socket" string => "/run/php/php$(version)-fpm.sock"; + "fpm_socket_type" string => "unix"; "apt_repo_url" string => "https://packages.sury.org/php/"; "apt_repo_key" string => "https://packages.sury.org/php/apt.gpg"; @@ -190,14 +206,18 @@ vars: freebsd:: "ini_files" slist => { - "/etc/php/$(install_php.version)/apache2/php.ini", - "/etc/php/$(install_php.version)/fpm/php.ini" +# "/etc/php/$(install_php.version)/apache2/php.ini", +# "/etc/php/$(install_php.version)/fpm/php.ini" }; "cli_exe" string => "/usr/local/bin/php"; "version" string => "8.2"; "bsdvs" string => "82"; "apache_m" string => "php"; "apache_f" string => "libphp"; + "fpm_pkgs" slist => {}; + "fpm_service_name" string => "php-fpm"; + "fpm_socket" string => "127.0.0.1:9000"; + "fpm_socket_type" string => "inet"; centos:: "cli_exe" string => "/usr/bin/php"; @@ -219,22 +239,31 @@ files: #methods: # "any" usebundle => install_php; reports: - "PHP VERSION: $(ini_files) V:$(install_php.version)"; +# "PHP VERSION: $(ini_files) V:$(install_php.version)"; } bundle agent install_php_fpm { +vars: + "service_deps" slist => { + "php_fpm_pkgs_installed", + "php_pkgs_installed" + }; + freebsd:: + "service_deps" slist => { + "php_pkgs_installed" + }; + methods: "any" usebundle => install_php; "any" usebundle => wmde_install_packages(@(php.fpm_pkgs),"php_fpm"); "any" usebundle => wmde_service("$(php.fpm_service_name)","php_kept|php_fpm_kept","php_repaired|php_fpm_repaired"), - depends_on =>{ - "php_fpm_pkgs_installed", - "php_pkgs_installed" - }; + depends_on => @(service_deps); +reports: +# "php ????"; }