WMDE
/
wmdeit-cf-wmdelib
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added some dependencies and default values

This commit is contained in:
Tobias Herre 2023-09-27 22:05:59 +02:00
parent c8a157ad49
commit 2a4534bfa4
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apache.cf
View File

@ -142,16 +142,18 @@ files:
create => "true", create => "true",
edit_template => "$(sys.workdir)/inputs/$(def.mfdomain)/templates/httpd.conf.mustache", edit_template => "$(sys.workdir)/inputs/$(def.mfdomain)/templates/httpd.conf.mustache",
template_method => "mustache", template_method => "mustache",
handle => "apache_main_cfg_crreated",
classes => if_repaired(apache_changed); classes => if_repaired(apache_changed);
services: services:
"$(apache.service_name)" "$(apache.service_name)"
depends_on => {"apache_editrc","apache_vhost_dir_created"}, depends_on => {"apache_editrc","apache_vhost_dir_created","apache_www_dir_created","apache_main_cfg_crreated"},
service_policy => "start", service_policy => "start",
handle => "apache_running"; handle => "apache_running";
"php_changed|apache_changed":: "php_changed|apache_changed"::
"$(apache.service_name)" "$(apache.service_name)"
depends_on => {"apache_vhost_dir_created","apache_www_dir_created","apache_main_cfg_crreated"},
service_policy => "restart"; service_policy => "restart";
} }
@ -164,12 +166,21 @@ commands:
bundle agent apache_vhost bundle agent apache_vhost
(site) (site_param)
{ {
classes: classes:
"delete" expression => $(site[disable]); "delete" expression => $(site[disable]);
"use_ssl" expression => $(site[ssl]); "use_ssl" expression => $(site[ssl]);
vars: vars:
"site_defaults" data => '
{
"aliases":[],
}
';
"site" data => mergedata(site_defaults,site_param);
"cert_file" string => "$(certbot.certbot_dir)/live/$(site[domain])"; "cert_file" string => "$(certbot.certbot_dir)/live/$(site[domain])";
"template_file" "template_file"
@ -206,7 +217,7 @@ files:
methods: methods:
use_ssl:: use_ssl::
"any" usebundle => certbot_cert(@(site),"$(apache.default_html_dir)","$(site[domain])"), "any" usebundle => certbot_cert(@(site),"$(apache.default_html_dir)"), #,"$(site[domain])"),
handle => "apache_ssl_created$(site[domain])"; handle => "apache_ssl_created$(site[domain])";