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

Some fixes for fedora

This commit is contained in:
Tube 2023-10-24 23:16:50 +02:00
parent fbfa6d7092
commit 09599ad24f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apache.cf
View File

@ -24,7 +24,7 @@ vars:
"apache_pkgs_installed", "apache_pkgs_installed",
"apache_php_pkgs_installed", "apache_php_pkgs_installed",
"apache_www_dir_created", "apache_www_dir_created",
"apache_vhost_dir_created", "apache_dummy_conf_created",
"apache_main_cfg_created" "apache_main_cfg_created"
}; };
@ -35,12 +35,13 @@ vars:
"service_deps" slist => { "service_deps" slist => {
"apache_pkgs_installed", "apache_pkgs_installed",
"apache_www_dir_created", "apache_www_dir_created",
"apache_vhost_dir_created", "apache_dummy_conf_created",
"apache_main_cfg_created" "apache_main_cfg_created"
}; };
"cfg_deps" slist => { "apache_pkgs_installed" }; "cfg_deps" slist => { "apache_pkgs_installed" };
"log_dir_mode" string => "750";
freebsd:: freebsd::
"pkgs" slist => { "pkgs" slist => {
@ -118,7 +119,8 @@ vars:
fedora|centos:: fedora|centos::
"log_dir" string =>"/var/log/httpd"; "log_dir" string =>"/var/log/httpd";
"log_dir_owner" string => "root"; "log_dir_owner" string => "root";
"log_dir_group" string => "wheel"; "log_dir_group" string => "root";
"log_dir_mode" string => "700";
"service_name" string => "httpd"; "service_name" string => "httpd";
"restart_cmd" string => "/usr/bin/systemctl restart $(service_name)"; "restart_cmd" string => "/usr/bin/systemctl restart $(service_name)";
@ -132,13 +134,14 @@ vars:
"main_cfg" string => "$(cfg_dir)/conf/httpd.conf"; "main_cfg" string => "$(cfg_dir)/conf/httpd.conf";
"libexec_dir" string => "$(cfg_dir)/modules"; "libexec_dir" string => "$(cfg_dir)/modules";
"server_root" string => "/var"; "server_root" string => "/etc/httpd";
"modules" data => '[ "modules" data => '[
{m: "autoindex",f:"mod_autoindex"}, {m: "autoindex",f:"mod_autoindex"},
{m: "log_config",f:"mod_log_config"}, {m: "log_config",f:"mod_log_config"},
{m: "version",f:"mod_version"}, {m: "version",f:"mod_version"},
{m: "unixd",f:"mod_unixd"}, {m: "unixd",f:"mod_unixd"},
{m: "systemd",f:"mod_systemd"}
]'; ]';
# {m: "php",f:"libphp8"}, # {m: "php",f:"libphp8"},
@ -210,7 +213,7 @@ reports:
files: files:
"$(apache.log_dir)/." "$(apache.log_dir)/."
create=>"true", create=>"true",
perms=>mog("750","$(apache.log_dir_owner)","$(apache.log_dir_group)"), perms=>mog("$(apache.log_dir_mode)","$(apache.log_dir_owner)","$(apache.log_dir_group)"),
handle => "apache_log_dir_created"; handle => "apache_log_dir_created";
"$(apache.www_dir)/." "$(apache.www_dir)/."
@ -229,11 +232,19 @@ files:
create=>"true", create=>"true",
content=>"", content=>"",
perms => m("644"), perms => m("644"),
depends_on => { "apache_vhosts_dir_created" },
handle=> "apache_dummy_conf_created";
"$(apache.cfg_dir)/Vhosts/."
create => "true",
depends_on => { "apache_pkgs_installed" }, depends_on => { "apache_pkgs_installed" },
handle=> "apache_vhost_dir_created"; perms => m("755"),
handle=> "apache_vhosts_dir_created";
"$(apache.main_cfg)" "$(apache.main_cfg)"
create => "true", create => "true",
perms => m("644"),
edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd.conf.mustache", edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd.conf.mustache",
template_method => "mustache", template_method => "mustache",
handle => "apache_main_cfg_created", handle => "apache_main_cfg_created",