X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-httpd.conf;h=aed7d549351f1177b6f002464182b671e9fb0284;hb=de4e94798b244da49f6884463e344e8c7e725386;hp=37b794206d09b9b0b24964669d1675637495ec6e;hpb=b06b509ad214e3d258082b0374c8652ce752bbcf;p=packages%2Fapache.git

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 37b7942..aed7d54 100644
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -10,7 +10,6 @@
 # for a discussion of each configuration directive.
 
 ServerRoot "/etc/httpd"
-DefaultType text/plain
 
 # User/Group: The name (or #number) of the user/group to run httpd as.
 # It is usually good practice to create a dedicated user and group for
@@ -29,9 +28,9 @@ Listen 80
 
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.  This address appears on some server-generated pages, such
-# as error documents.  e.g. admin@your-domain.com
+# as error documents.  e.g. admin@example.com
 #
-ServerAdmin you@example.com
+ServerAdmin root@example.com
 
 # ServerName gives the name and port that the server uses to identify itself.
 # This can often be determined automatically, but we recommend you specify
@@ -59,17 +58,18 @@ MaxKeepAliveRequests 100
 KeepAliveTimeout 5
 UseCanonicalName Off
 AccessFileName .htaccess
-ServerTokens Full
+ServerTokens Prod
 ServerSignature On
 HostnameLookups Off
+#AddDefaultCharset UTF-8
 
 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.
@@ -85,8 +85,26 @@ Include webapps.d/*.conf
 		AllowOverride None
 		Options None
 		<IfModule mod_authz_host.c>
-			Order allow,deny
-			Allow from all
+			Require all granted
 		</IfModule>
 	</Directory>
 </IfModule>
+
+# VirtualHost: Allows the daemon to respond to requests for more than one
+# server address, if your server machine is configured to accept IP packets
+# for multiple addresses. This can be accomplished with the ifconfig
+# alias flag, or through kernel patches like VIF.
+
+# Any apache.conf conf directive may go into a VirtualHost command.
+# See also the BindAddress entry.
+
+# Setup default vhost (first one defined in config) and include vhosts configuration
+<VirtualHost *:80>
+    ServerName localhost
+#	ServerAdmin webmaster@host.example.com
+#	DocumentRoot /www/docs/host.example.com
+#	ErrorLog logs/host.example.com-error_log
+#	TransferLog logs/host.example.com-access_log
+</VirtualHost>
+
+IncludeOptional vhosts.d/*.conf