ServerAdmin email in httpd.conf

changed string to data.
2023-09-26 16:09:33 +02:00 · 2023-09-26 14:58:58 +02:00
2 changed files with 5 additions and 2 deletions
--- a/apache.cf
+++ b/apache.cf
@ -78,7 +78,7 @@ vars:
 		"phpm" string => "php";

 	ubuntu::
-		"modules" string => '[
+		"modules" data => '[
 			{m:"$(phpm)",f:"libphp$(install_php.version)"},
 			{m:"proxy",f:"mod_proxy"},
 			{m:"proxy_http",f:"mod_proxy_http"},
--- a/templates/httpd.conf.mustache
+++ b/templates/httpd.conf.mustache
@ -567,10 +567,13 @@ SSLRandomSeed connect builtin
 	DirectoryIndex index.html
 </Directory>
 <VirtualHost *:80>
-	ServerAdmin webmaster@dummy-host.example.com
+{{#vars.apache.admin_email}}
+	ServerAdmin {{.}}
+{{/vars.apache.admin_email}}
 	DocumentRoot "{{vars.apache.default_html_dir}}"
 	ErrorLog "{{vars.apache.log_dir}}/default-error.log"
 	CustomLog "{{vars.apache.log_dir}}/default-access.log" common
+	DirectoryIndex index.php index.html
 </VirtualHost>
Author	SHA1	Message	Date
Tobias Herre	c8a157ad49	ServerAdmin email in httpd.conf	2023-09-26 16:09:33 +02:00
Tobias Herre	3f320b5cd1	changed string to data.	2023-09-26 14:58:58 +02:00