apache: Write hostname into configuration at boot time

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

lfs/apache2

@@ -113,7 +113,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Install apache config
 	cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
-	ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
+	touch /etc/httpd/conf/hostname.conf
 
 	# Create captive logging directory
 	-mkdir -pv /var/log/httpd/captive

src/initscripts/system/apache

@@ -61,6 +61,9 @@ case "$1" in
 		# Generate all required certificates
 		generate_certificates
 
+		# Update hostname
+		echo "ServerName ${HOSTNAME}" > /etc/httpd/conf/hostname.conf
+
 		boot_mesg "Starting Apache daemon..."
 		/usr/sbin/apachectl -k start
 		evaluate_retval

src/setup/misc.c

@@ -57,15 +57,6 @@ int writehostsfiles(void)
 	findkey(kv, "DOMAINNAME", domainname);
 	freekeyvalues(kv);
 		
-	if (!(file = fopen(CONFIG_ROOT "/main/hostname.conf", "w")))
-	{
-		sprintf (message, _("Unable to write %s/main/hostname.conf"), CONFIG_ROOT);
-		errorbox(message);
-		return 0;
-	}
-	fprintf(file, "ServerName %s.%s\n", hostname,domainname);
-	fclose(file);
-	
 	if (!(file = fopen(CONFIG_ROOT "/main/hosts", "r")))
 	{
 		errorbox(_("Unable to open main hosts file."));