Dependencies added
This commit is contained in:
parent
1e1c0e8f0d
commit
0b7b31eb3e
14
apache.cf
14
apache.cf
|
@ -41,6 +41,7 @@ vars:
|
||||||
|
|
||||||
"cfg_deps" slist => { "apache_pkgs_installed" };
|
"cfg_deps" slist => { "apache_pkgs_installed" };
|
||||||
|
|
||||||
|
any::
|
||||||
"log_dir_mode" string => "750";
|
"log_dir_mode" string => "750";
|
||||||
|
|
||||||
freebsd::
|
freebsd::
|
||||||
|
@ -212,7 +213,7 @@ commands:
|
||||||
reports:
|
reports:
|
||||||
}
|
}
|
||||||
|
|
||||||
bundle agent install_apache(raw)
|
bundle agent install_apache
|
||||||
{
|
{
|
||||||
|
|
||||||
methods:
|
methods:
|
||||||
|
@ -287,6 +288,8 @@ commands:
|
||||||
"/bin/sh"
|
"/bin/sh"
|
||||||
args => "$(sys.workdir)/inputs/$(def.wmde_libdir)/scripts/del-files-not-in-list.sh $(apache.cfg_dir)/Vhosts $(sys.workdir)/data/agent/apache/domains.txt && echo dummy.conf > $(sys.workdir)/data/agent/apache/domains.txt",
|
args => "$(sys.workdir)/inputs/$(def.wmde_libdir)/scripts/del-files-not-in-list.sh $(apache.cfg_dir)/Vhosts $(sys.workdir)/data/agent/apache/domains.txt && echo dummy.conf > $(sys.workdir)/data/agent/apache/domains.txt",
|
||||||
inform => "false",
|
inform => "false",
|
||||||
|
handle => "apache_vhost_dir_cleaned",
|
||||||
|
depends_on => {"apache_dummy_conf_created"},
|
||||||
contain => wmde_cmd_useshell;
|
contain => wmde_cmd_useshell;
|
||||||
|
|
||||||
|
|
||||||
|
@ -356,9 +359,14 @@ vars:
|
||||||
"$(site[ssl_key])");
|
"$(site[ssl_key])");
|
||||||
|
|
||||||
use_ssl&(use_certbot)::
|
use_ssl&(use_certbot)::
|
||||||
"vhostdeps" slist => {"apache_ssl_created$(site[domain])"};
|
"vhostdeps" slist => {
|
||||||
|
"apache_ssl_created$(site[domain])",
|
||||||
|
"apache_vhost_dir_cleaned"
|
||||||
|
};
|
||||||
(!use_ssl)|(!use_certbot)::
|
(!use_ssl)|(!use_certbot)::
|
||||||
"vhostdeps" slist => {};
|
"vhostdeps" slist => {
|
||||||
|
"apache_vhost_dir_cleaned"
|
||||||
|
};
|
||||||
files:
|
files:
|
||||||
|
|
||||||
delete::
|
delete::
|
||||||
|
|
Loading…
Reference in New Issue