Workaround for mod php not istallable on Debian
This commit is contained in:
parent
e371e93409
commit
7464c8f22c
51
apache.cf
51
apache.cf
|
@ -14,7 +14,6 @@ vars:
|
||||||
freebsd::
|
freebsd::
|
||||||
"pkgs" slist => {
|
"pkgs" slist => {
|
||||||
"apache24",
|
"apache24",
|
||||||
"mod_php74"
|
|
||||||
};
|
};
|
||||||
"log_dir" string =>"/var/log/httpd";
|
"log_dir" string =>"/var/log/httpd";
|
||||||
"service_name" string => "apache24";
|
"service_name" string => "apache24";
|
||||||
|
@ -43,7 +42,6 @@ vars:
|
||||||
debian::
|
debian::
|
||||||
"pkgs" slist => {
|
"pkgs" slist => {
|
||||||
"apache2",
|
"apache2",
|
||||||
"libapache2-mod-php",
|
|
||||||
"libapache2-mod-svn",
|
"libapache2-mod-svn",
|
||||||
};
|
};
|
||||||
"log_dir" string =>"/var/log/apache2";
|
"log_dir" string =>"/var/log/apache2";
|
||||||
|
@ -70,7 +68,6 @@ vars:
|
||||||
"pkgs" slist => {
|
"pkgs" slist => {
|
||||||
"httpd",
|
"httpd",
|
||||||
"mod_ssl",
|
"mod_ssl",
|
||||||
"libapache2-mod-php",
|
|
||||||
"libapache2-mod-svn",
|
"libapache2-mod-svn",
|
||||||
};
|
};
|
||||||
fedora::
|
fedora::
|
||||||
|
@ -123,6 +120,45 @@ vars:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bundle agent install_apache_php
|
||||||
|
{
|
||||||
|
vars:
|
||||||
|
freeebsd::
|
||||||
|
"pkgs" slist => {"mod_php74"};
|
||||||
|
debian::
|
||||||
|
"pkgs" slist => {"libapache2-mod-php"};
|
||||||
|
centos::
|
||||||
|
"pkgs" slist => {"libapache2-mod-php"};
|
||||||
|
|
||||||
|
packages:
|
||||||
|
freebsd::
|
||||||
|
"$(pkgs)"
|
||||||
|
policy => "present",
|
||||||
|
package_module => pkg,
|
||||||
|
handle => "apache_php_installed",
|
||||||
|
classes => if_repaired(apache_changed);
|
||||||
|
debian::
|
||||||
|
"$(pkgs)"
|
||||||
|
policy => "present",
|
||||||
|
package_module => apt_get,
|
||||||
|
handle => "apache_php_installed",
|
||||||
|
depends_on => { "apache_mpm_event_disabled" },
|
||||||
|
classes => if_repaired(apache_changed);
|
||||||
|
fedora|centos::
|
||||||
|
"$(pkgs)"
|
||||||
|
policy => "present",
|
||||||
|
package_module => yum,
|
||||||
|
handle => "apache_php_installed",
|
||||||
|
classes => if_repaired(apache_changed);
|
||||||
|
|
||||||
|
commands:
|
||||||
|
"/bin/sh"
|
||||||
|
args => "-c '/usr/sbin/a2dismod mpm_event > /dev/null'",
|
||||||
|
inform=>"false",
|
||||||
|
handle => "apache_mpm_event_disabled";
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
bundle agent install_apache(raw)
|
bundle agent install_apache(raw)
|
||||||
{
|
{
|
||||||
classes:
|
classes:
|
||||||
|
@ -132,17 +168,23 @@ packages:
|
||||||
"$(apache.pkgs)"
|
"$(apache.pkgs)"
|
||||||
policy => "present",
|
policy => "present",
|
||||||
package_module => pkg,
|
package_module => pkg,
|
||||||
|
handle => "apache_pkgs_installed",
|
||||||
classes => if_repaired(apache_changed);
|
classes => if_repaired(apache_changed);
|
||||||
debian::
|
debian::
|
||||||
"$(apache.pkgs)"
|
"$(apache.pkgs)"
|
||||||
policy => "present",
|
policy => "present",
|
||||||
package_module => apt_get,
|
package_module => apt_get,
|
||||||
|
handle => "apache_pkgs_installed",
|
||||||
classes => if_repaired(apache_changed);
|
classes => if_repaired(apache_changed);
|
||||||
fedora|centos::
|
fedora|centos::
|
||||||
"$(apache.pkgs)"
|
"$(apache.pkgs)"
|
||||||
policy => "present",
|
policy => "present",
|
||||||
package_module => yum,
|
package_module => yum,
|
||||||
|
handle => "apache_pkgs_installed",
|
||||||
classes => if_repaired(apache_changed);
|
classes => if_repaired(apache_changed);
|
||||||
|
methods:
|
||||||
|
"any" usebundle => install_apache_php,
|
||||||
|
depends_on => { "apache_pkgs_installed" };
|
||||||
commands:
|
commands:
|
||||||
freebsd::
|
freebsd::
|
||||||
"/usr/sbin/sysrc"
|
"/usr/sbin/sysrc"
|
||||||
|
@ -157,6 +199,7 @@ files:
|
||||||
"$(apache.www_dir)/."
|
"$(apache.www_dir)/."
|
||||||
create=>"true",
|
create=>"true",
|
||||||
perms => uperm("root","root","755"),
|
perms => uperm("root","root","755"),
|
||||||
|
depends_on => { "apache_pkgs_installed" },
|
||||||
handle => "apache_www_dir_created";
|
handle => "apache_www_dir_created";
|
||||||
|
|
||||||
"$(apache.default_html_dir)/."
|
"$(apache.default_html_dir)/."
|
||||||
|
@ -169,6 +212,7 @@ files:
|
||||||
create=>"true",
|
create=>"true",
|
||||||
content=>"",
|
content=>"",
|
||||||
perms => uperm("root","root","644"),
|
perms => uperm("root","root","644"),
|
||||||
|
depends_on => { "apache_pkgs_installed" },
|
||||||
handle=> "apache_vhost_dir_created";
|
handle=> "apache_vhost_dir_created";
|
||||||
|
|
||||||
"$(apache.main_cfg)"
|
"$(apache.main_cfg)"
|
||||||
|
@ -176,6 +220,7 @@ files:
|
||||||
edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd.conf.mustache",
|
edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd.conf.mustache",
|
||||||
template_method => "mustache",
|
template_method => "mustache",
|
||||||
handle => "apache_main_cfg_crreated",
|
handle => "apache_main_cfg_crreated",
|
||||||
|
depends_on => { "apache_pkgs_installed","apache_php_installed" },
|
||||||
classes => if_repaired(apache_changed);
|
classes => if_repaired(apache_changed);
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
Loading…
Reference in New Issue