- update configs

diff --git a/apache-httpd.conf b/apache-httpd.conf
index ec2c372f7a3dad99f271e0cd9ce6f8340afc6b20..b2b641194e4ffabc1cd5840baa86a294f51e0d72 100644 (file)
--- 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
 
 <IfModule alias_module>
        # 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
 <VirtualHost *:80>
     ServerName localhost
 #      ServerAdmin webmaster@host.example.com
@@ -110,4 +109,4 @@ NameVirtualHost *:80
 #      TransferLog logs/host.example.com-access_log
 </VirtualHost>
 
-Include vhosts.d/*.conf
+IncludeOptional vhosts.d/*.conf

diff --git a/apache-mpm.conf b/apache-mpm.conf
index 63ca63d37ce320e913042bc198f05ddc3ae6e42d..033073b05caf16e9870520fd53981a700bbb3dfc 100644 (file)
--- 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