From 6723afef0922295dbd8ea66171270040b0edc002 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 25 Jun 2018 10:59:49 +0100 Subject: [PATCH] apache: Write hostname into configuration at boot time Signed-off-by: Michael Tremer --- lfs/apache2 | 2 +- src/initscripts/system/apache | 3 +++ src/setup/misc.c | 9 --------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/lfs/apache2 b/lfs/apache2 index 69b05341da..16dd101d78 100644 --- a/lfs/apache2 +++ b/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 diff --git a/src/initscripts/system/apache b/src/initscripts/system/apache index f2a9fb8720..d9cc7fa48d 100644 --- a/src/initscripts/system/apache +++ b/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 diff --git a/src/setup/misc.c b/src/setup/misc.c index a31b1d8a84..0710c5b955 100644 --- a/src/setup/misc.c +++ b/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.")); -- 2.39.2