diff --git a/apache.cf b/apache.cf index 0c8cb3f..424cbc6 100644 --- a/apache.cf +++ b/apache.cf @@ -24,7 +24,7 @@ vars: "apache_pkgs_installed", "apache_php_pkgs_installed", "apache_www_dir_created", - "apache_vhost_dir_created", + "apache_dummy_conf_created", "apache_main_cfg_created" }; @@ -35,12 +35,13 @@ vars: "service_deps" slist => { "apache_pkgs_installed", "apache_www_dir_created", - "apache_vhost_dir_created", + "apache_dummy_conf_created", "apache_main_cfg_created" }; "cfg_deps" slist => { "apache_pkgs_installed" }; + "log_dir_mode" string => "750"; freebsd:: "pkgs" slist => { @@ -118,7 +119,8 @@ vars: fedora|centos:: "log_dir" string =>"/var/log/httpd"; "log_dir_owner" string => "root"; - "log_dir_group" string => "wheel"; + "log_dir_group" string => "root"; + "log_dir_mode" string => "700"; "service_name" string => "httpd"; "restart_cmd" string => "/usr/bin/systemctl restart $(service_name)"; @@ -132,13 +134,14 @@ vars: "main_cfg" string => "$(cfg_dir)/conf/httpd.conf"; "libexec_dir" string => "$(cfg_dir)/modules"; - "server_root" string => "/var"; + "server_root" string => "/etc/httpd"; "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: "php",f:"libphp8"}, @@ -210,7 +213,7 @@ reports: files: "$(apache.log_dir)/." 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"; "$(apache.www_dir)/." @@ -229,11 +232,19 @@ files: create=>"true", content=>"", 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" }, - handle=> "apache_vhost_dir_created"; + perms => m("755"), + handle=> "apache_vhosts_dir_created"; + "$(apache.main_cfg)" create => "true", + perms => m("644"), edit_template => "$(sys.workdir)/inputs/$(def.wmde_libdir)/templates/httpd.conf.mustache", template_method => "mustache", handle => "apache_main_cfg_created",