From: Bartosz Świątek Date: Fri, 24 Feb 2012 17:18:19 +0000 (+0100) Subject: - update configs X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapache.git;a=commitdiff_plain;h=77aebe072d0f739d42af382fb5e69c49011f767e - update configs --- diff --git a/apache-httpd.conf b/apache-httpd.conf index ec2c372..b2b6411 100644 --- a/apache-httpd.conf +++ b/apache-httpd.conf @@ -67,10 +67,10 @@ HostnameLookups Off TraceEnable Off # Include other modules and packages config. -Include conf.d/*.conf +IncludeOptional conf.d/*.conf # Include webapps config -Include webapps.d/*.conf +IncludeOptional webapps.d/*.conf # ScriptAlias: This controls which directories contain server scripts. @@ -101,7 +101,6 @@ Include webapps.d/*.conf # See also the BindAddress entry. # Setup default vhost (first one defined in config) and include vhosts configuration -NameVirtualHost *:80 ServerName localhost # ServerAdmin webmaster@host.example.com @@ -110,4 +109,4 @@ NameVirtualHost *:80 # TransferLog logs/host.example.com-access_log -Include vhosts.d/*.conf +IncludeOptional vhosts.d/*.conf diff --git a/apache-mpm.conf b/apache-mpm.conf index 63ca63d..033073b 100644 --- a/apache-mpm.conf +++ b/apache-mpm.conf @@ -17,7 +17,7 @@ PidFile /var/run/httpd.pid # # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. # -LockFile /var/run/httpd/accept.lock +Mutex file:/var/run/httpd/ # # Only one of the below sections will be relevant on your