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

Compare commits

base: WMDE:088242592ae6003b8001b46fe6fc4d82808ff740
Branches Tags
WMDE:main
..
compare: WMDE:c8a157ad49f9652be3d14707f7c6935e92678ab7
Branches Tags
WMDE:main

No commits in common. "088242592ae6003b8001b46fe6fc4d82808ff740" and "c8a157ad49f9652be3d14707f7c6935e92678ab7" have entirely different histories.
088242592a ... c8a157ad49

3 changed files with 5 additions and 22 deletions
Show Stats Expand all files Collapse all files

17
apache.cf
View File

@ -142,18 +142,16 @@ 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","apache_www_dir_created","apache_main_cfg_crreated"}, depends_on => {"apache_editrc","apache_vhost_dir_created"},
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";
} }
@ -166,21 +164,12 @@ commands:
bundle agent apache_vhost bundle agent apache_vhost
(site_param) (site)
{ {
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"
@ -217,7 +206,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])";

8
certbot.cf
View File

@ -42,13 +42,10 @@ packages:
handle => "certbot_installed"; handle => "certbot_installed";
} }
bundle agent certbot_cert(site,webroot) bundle agent certbot_cert(site,webroot,domain)
{ {
vars: vars:
"domain" string => "$(site[domain])";
"site_json" string => storejson(@(site)); "site_json" string => storejson(@(site));
"args" string => string_mustache( "args" string => string_mustache(
"-d {{domain}} {{#aliases}} -d {{.}} {{/aliases}}", "-d {{domain}} {{#aliases}} -d {{.}} {{/aliases}}",
@ -74,8 +71,7 @@ classes:
or => {no_cert_file, certbot_repaired}; or => {no_cert_file, certbot_repaired};
defaults: defaults:
"webroot" string => "standalone"; "webroot" string => "standalone";
"domain" string => "$(site[domain])";
methods: methods:
"any" usebundle => install_certbot; "any" usebundle => install_certbot;

2
templates/httpd-vhost.conf.mustache
View File

@ -21,7 +21,6 @@
ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}} ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}}
ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log" ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log"
CustomLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-access.log" combined CustomLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-access.log" combined
{{vars.apache_vhost.site.raw}}
</VirtualHost> </VirtualHost>
{{/vars.apache_vhost.site.ssl}} {{/vars.apache_vhost.site.ssl}}
@ -49,7 +48,6 @@
RewriteEngine On RewriteEngine On
Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/" Alias /.well-known/acme-challenge/ "{{vars.apache.default_html_dir}}/.well-known/acme-challenge/"
RewriteRule "^/.well-known/acme-challenge/" - [L] RewriteRule "^/.well-known/acme-challenge/" - [L]
{{vars.apache_vhost.site.raw}}
</VirtualHost> </VirtualHost>
{{/vars.apache_vhost.site.ssl}} {{/vars.apache_vhost.site.ssl}}