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

Fixes for CentOS

This commit is contained in:
Tube 2023-10-25 01:18:16 +02:00
parent 627e30b2e7
commit 754865e877
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apache.cf
View File

@ -104,12 +104,13 @@ 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",
"libapache2-mod-svn", "mod_dav_svn"
}; };
fedora:: fedora::
"pkgs" slist => { "pkgs" slist => {
@ -144,6 +145,16 @@ 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"},
]';
@ -327,7 +338,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",
@ -357,7 +368,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");
@ -368,7 +379,9 @@ methods:
"apache_vhost_restart":: "apache_vhost_restart"::
"any" usebundle => restart_apache("$(site[domain])"), "any" usebundle => restart_apache("$(site[domain])"),
depends_on => {"vhost_cfg_done$(site[domain])","apache_ssl_created$(site[domain])" }; depends_on => {
"vhost_cfg_done$(site[domain])",
"apache_ssl_created$(site[domain])" };
(!use_ssl)|(!use_certbot):: (!use_ssl)|(!use_certbot)::