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

Compare commits

base: WMDE:d761d054f47e46048b23d5b79c3db24c70719fc9
Branches Tags
WMDE:main
..
compare: WMDE:627e30b2e7db58389fdbce492ec7754f86d1348a
Branches Tags
WMDE:main

No commits in common. "d761d054f47e46048b23d5b79c3db24c70719fc9" and "627e30b2e7db58389fdbce492ec7754f86d1348a" have entirely different histories.
d761d054f4 ... 627e30b2e7

2 changed files with 19 additions and 31 deletions
Show Stats Expand all files Collapse all files

21
apache.cf
View File

@ -104,13 +104,12 @@ vars:
# {m:"php",f:"libphp$(php.version)"}, # {m:"php",f:"libphp$(php.version)"},
# "libapache2-mod-svn",
centos:: centos::
"pkgs" slist => { "pkgs" slist => {
"httpd", "httpd",
"mod_ssl", "mod_ssl",
"mod_dav_svn" "libapache2-mod-svn",
}; };
fedora:: fedora::
"pkgs" slist => { "pkgs" slist => {
@ -145,16 +144,6 @@ vars:
{m: "systemd",f:"mod_systemd"} {m: "systemd",f:"mod_systemd"}
]'; ]';
# {m: "php",f:"libphp8"}, # {m: "php",f:"libphp8"},
centos::
"modules" data => '[
{m: "autoindex",f:"mod_autoindex"},
{m: "log_config",f:"mod_log_config"},
{m: "version",f:"mod_version"},
{m: "unixd",f:"mod_unixd"},
{m: "systemd",f:"mod_systemd"},
{m:"ssl",f:"mod_ssl"},
]';
@ -338,7 +327,7 @@ vars:
"$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd-vhost.conf.mustache"; "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd-vhost.conf.mustache";
"domain_file" string => "$(apache.cfg_dir)/Vhosts/$(site[domain]).conf"; "domain_file" string => "$(apache.cfg_dir)/Vhosts/$(site[domain]).conf";
"domain_dir" string => "$(apache.www_dir)/$(site[domain])"; "domain_dir" string => "$(apache.www_dir)/$(site[domain])/";
"ssl_cert" string => ifelse( use_certbot, "ssl_cert" string => ifelse( use_certbot,
"$(certbot.certbot_dir)/live/$(site[domain])/fullchain.pem", "$(certbot.certbot_dir)/live/$(site[domain])/fullchain.pem",
@ -368,7 +357,7 @@ vars:
depends_on => @(vhostdeps), depends_on => @(vhostdeps),
classes => if_repaired("apache_vhost_restart"); classes => if_repaired("apache_vhost_restart");
"$(domain_dir)/." "$(domain_dir)."
create => "true", create => "true",
perms => uperm("$(apache.www_user)","$(apache.www_group)","750"); perms => uperm("$(apache.www_user)","$(apache.www_group)","750");
@ -379,9 +368,7 @@ methods:
"apache_vhost_restart":: "apache_vhost_restart"::
"any" usebundle => restart_apache("$(site[domain])"), "any" usebundle => restart_apache("$(site[domain])"),
depends_on => { depends_on => {"vhost_cfg_done$(site[domain])","apache_ssl_created$(site[domain])" };
"vhost_cfg_done$(site[domain])",
"apache_ssl_created$(site[domain])" };
(!use_ssl)|(!use_certbot):: (!use_ssl)|(!use_certbot)::

27
certbot.cf
View File

@ -11,20 +11,11 @@ vars:
freebsd:: freebsd::
"certbot_dir" string => "/usr/local/etc/letsencrypt"; "certbot_dir" string => "/usr/local/etc/letsencrypt";
"exe" string => "/usr/local/bin/certbot"; "exe" string => "/usr/local/bin/certbot";
"pkgs" slist => {"py39-certbot"}; "pkg" string => "py39-certbot";
debian:: debian::
"certbot_dir" string => "/etc/letsencrypt"; "certbot_dir" string => "/etc/letsencrypt";
"exe" string => "/usr/bin/certbot"; "exe" string => "/usr/bin/certbot";
"pkgs" slist => {"certbot"}; "pkg" string => "certbot";
centos::
"certbot_dir" string => "/etc/letsencrypt";
"exe" string => "/usr/bin/certbot";
"pkgs" slist => {"epel-release","certbot"};
fedora::
"certbot_dir" string => "/etc/letsencrypt";
"exe" string => "/usr/bin/certbot";
"pkgs" slist => {"certbot"};
defaults: defaults:
"wr" string => "standalone"; "wr" string => "standalone";
@ -37,8 +28,17 @@ reports:
bundle agent install_certbot bundle agent install_certbot
{ {
methods: packages:
"any" usebundle => wmde_install_packages( @(certbot.pkgs),"certbot"),
freebsd::
"$(certbot.pkg)"
policy => "present",
package_module => pkg,
handle => "certbot_installed";
debian::
"$(certbot.pkg)"
policy => "present",
package_module => apt_get,
handle => "certbot_installed"; handle => "certbot_installed";
files: files:
freebsd:: freebsd::
@ -112,6 +112,7 @@ commands:
args => "certonly --agree-tos -n $(webroot_arg) --expand --email $(site[email]) $(args)"; args => "certonly --agree-tos -n $(webroot_arg) --expand --email $(site[email]) $(args)";
reports: reports:
# "DOMAINS FOR: $(site[domain]) $(domains)";
} }