captive: Log into default apache log files

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

diff --git a/config/httpd/vhosts.d/captive.conf b/config/httpd/vhosts.d/captive.conf
index 0824b79561d87f37728c9287399ab67f39e7fc82..c6daf7975bf5553c6d941dfb40c5f09278e5bcf6 100644 (file)
--- a/config/httpd/vhosts.d/captive.conf
+++ b/config/httpd/vhosts.d/captive.conf
@@ -2,9 +2,6 @@ Listen 1013
 
 <VirtualHost *:1013>
        DocumentRoot /srv/web/ipfire/html/captive
-       ServerAdmin alexander.marx@oab.de
-       ErrorLog /var/log/httpd/captive/error_log
-       TransferLog /var/log/httpd/captive/access_log
 
        <Directory /srv/web/ipfire/html/captive>
                Options ExecCGI

diff --git a/lfs/apache2 b/lfs/apache2
index 1e6f01655daa8d84c44c30b7e0fa390208964399..c66f3c3fa6c170e4070d5a42fc4b6ce65e540b0f 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -120,9 +120,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf
        ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/
 
-       # Create logdir for captive-portal
-       mkdir -pv /var/log/httpd/captive
-       
        # Create logodir for captive portal
        mkdir -pv /srv/web/ipfire/html/captive/logo
        chown nobody.nobody  /srv/web/ipfire/html/captive/logo