summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2006-12-17 20:23:06 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2006-12-17 20:23:06 +0000
commit8d84388b15600be17748a04eb5ec1c9a4ec564c1 (patch)
tree77956746c6a6b56edd7b39ada438b19f35322630 /generic
parente49c1189ade3468b923876680b3423d072b35aae (diff)
downloadptxdist-8d84388b15600be17748a04eb5ec1c9a4ec564c1.tar.gz
ptxdist-8d84388b15600be17748a04eb5ec1c9a4ec564c1.tar.xz
* apache2: agrrrr... this could never have worked. The default
config file searches mime.types in /var/www, whereas apache2.make installs it into /usr/share/apache2. Fixed default configuration. git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6511 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'generic')
-rw-r--r--generic/httpd.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/httpd.conf b/generic/httpd.conf
index 1fb0928ac..7b7e6c82f 100644
--- a/generic/httpd.conf
+++ b/generic/httpd.conf
@@ -415,7 +415,7 @@ AccessFileName .htaccess
# TypesConfig describes where the mime.types file (or equivalent) is
# to be found.
#
-TypesConfig @DOCUMENTROOT@/conf/mime.types
+TypesConfig @SERVERROOT@/conf/mime.types
#
# DefaultType is the default MIME type the server will use for a document
@@ -434,7 +434,7 @@ DefaultType text/plain
# directive tells the module where the hint definitions are located.
#
<IfModule mod_mime_magic.c>
- MIMEMagicFile @DOCUMENTROOT@/conf/magic
+ MIMEMagicFile @SERVERROOT@/conf/magic
</IfModule>
#