Fixes for CentOS
This commit is contained in:
parent
627e30b2e7
commit
754865e877
21
apache.cf
21
apache.cf
|
@ -104,12 +104,13 @@ vars:
|
|||
# {m:"php",f:"libphp$(php.version)"},
|
||||
|
||||
|
||||
# "libapache2-mod-svn",
|
||||
|
||||
centos::
|
||||
"pkgs" slist => {
|
||||
"httpd",
|
||||
"mod_ssl",
|
||||
"libapache2-mod-svn",
|
||||
"mod_dav_svn"
|
||||
};
|
||||
fedora::
|
||||
"pkgs" slist => {
|
||||
|
@ -144,6 +145,16 @@ vars:
|
|||
{m: "systemd",f:"mod_systemd"}
|
||||
]';
|
||||
# {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";
|
||||
|
||||
"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,
|
||||
"$(certbot.certbot_dir)/live/$(site[domain])/fullchain.pem",
|
||||
|
@ -357,7 +368,7 @@ vars:
|
|||
depends_on => @(vhostdeps),
|
||||
classes => if_repaired("apache_vhost_restart");
|
||||
|
||||
"$(domain_dir)."
|
||||
"$(domain_dir)/."
|
||||
create => "true",
|
||||
perms => uperm("$(apache.www_user)","$(apache.www_group)","750");
|
||||
|
||||
|
@ -368,7 +379,9 @@ methods:
|
|||
|
||||
"apache_vhost_restart"::
|
||||
"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)::
|
||||
|
|
Loading…
Reference in New Issue