apache.cf

@@ -24,7 +24,7 @@ vars:
 			"apache_pkgs_installed",
 			"apache_php_pkgs_installed",
 			"apache_www_dir_created",
-			"apache_dummy_conf_created",
+			"apache_vhost_dir_created",
 			"apache_main_cfg_created"
 	};
 
@@ -35,13 +35,12 @@ vars:
 	"service_deps" slist => {
 			"apache_pkgs_installed",
 			"apache_www_dir_created",
-			"apache_dummy_conf_created",
+			"apache_vhost_dir_created",
 			"apache_main_cfg_created"
 	};
 
 	"cfg_deps" slist => {  "apache_pkgs_installed" };
 
-	"log_dir_mode" string => "750";
 
 	freebsd::
 		"pkgs" slist => {
@@ -119,8 +118,7 @@ vars:
 	fedora|centos::
 		"log_dir" string =>"/var/log/httpd";
 		"log_dir_owner" string => "root";
-		"log_dir_group" string => "root";
-		"log_dir_mode" string => "700";
+		"log_dir_group" string => "wheel";
 
 		"service_name" string => "httpd";
 		"restart_cmd" string => "/usr/bin/systemctl restart $(service_name)";
@@ -134,14 +132,13 @@ vars:
 
 		"main_cfg" string => "$(cfg_dir)/conf/httpd.conf";
 		"libexec_dir" string => "$(cfg_dir)/modules";
-		"server_root" string => "/etc/httpd";
+		"server_root" string => "/var";
 
 		"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"},
 
@@ -213,7 +210,7 @@ reports:
 files:
 	"$(apache.log_dir)/."
 	create=>"true",
-	perms=>mog("$(apache.log_dir_mode)","$(apache.log_dir_owner)","$(apache.log_dir_group)"),
+	perms=>mog("750","$(apache.log_dir_owner)","$(apache.log_dir_group)"),
 	handle => "apache_log_dir_created";
 
 	"$(apache.www_dir)/."
@@ -232,19 +229,11 @@ 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" },
-	perms => m("755"),
-	handle=> "apache_vhosts_dir_created";	
-
+	handle=> "apache_vhost_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",

php.cf

@@ -14,18 +14,18 @@ vars:
 	freebsd::
 		"cli_exe" string => "/usr/local/bin/php";
 		"pkgs" slist => {
-			"php$(php.bsdvs)-session",
-			"php$(php.bsdvs)-zip",
-			"php$(php.bsdvs)-pgsql",
-			"php$(php.bsdvs)-mysqli",
-			"php$(php.bsdvs)-pdo_mysql",
-			"php$(php.bsdvs)-pdo",
-			"php$(php.bsdvs)-filter",
-			"php$(php.bsdvs)-mbstring",
-			"php$(php.bsdvs)-dom",
-			"php$(php.bsdvs)-xml",
-			"php$(php.bsdvs)-ctype",
-			"php$(php.bsdvs)-intl",
+			"php$(bsdvs)-session",
+			"php$(bsdvs)-zip",
+			"php$(bsdvs)-pgsql",
+			"php$(bsdvs)-mysqli",
+			"php$(bsdvs)-pdo_mysql",
+			"php$(bsdvs)-pdo",
+			"php$(bsdvs)-filter",
+			"php$(bsdvs)-mbstring",
+			"php$(bsdvs)-dom",
+			"php$(bsdvs)-xml",
+			"php$(bsdvs)-ctype",
+			"php$(bsdvs)-intl",
 		};
 	#	"php$(bsdvs)-json",
 

scripts/del-files-not-in-list.sh

@@ -8,14 +8,14 @@ list_file="$2"
 
 # Check if the folder exists
 if [ ! -d "$folder_path" ]; then
- # echo "Folder does not exist: $folder_path"
-  exit 0
+  echo "Folder does not exist: $folder_path"
+  exit 1
 fi
 
 # Check if the list file exists
 if [ ! -f "$list_file" ]; then
-#  echo "List file does not exist: $list_file"
-  exit 0
+  echo "List file does not exist: $list_file"
+  exit 1
 fi
 
 # Loop through the files in the folder