*** ./httpd.conf.ORIG Fri Jan 14 14:50:26 2011
--- ./httpd.conf Fri Jan 14 14:54:10 2011
***************
*** 78,84 ****
# identification number when it starts.
#
! PidFile /var/logs/httpd.pid
#
--- 78,84 ----
# identification number when it starts.
#
! PidFile /var/run/httpd.pid
#
***************
*** 256,264 ****
LoadModule proxy_connect_module /opt/freeware/lib/httpd/modules/mod_proxy_connect.so
LoadModule proxy_ftp_module /opt/freeware/lib/httpd/modules/mod_proxy_ftp.so
LoadModule proxy_http_module /opt/freeware/lib/httpd/modules/mod_proxy_http.so
-
- LoadModule ssl_module /opt/freeware/lib/httpd/modules/mod_ssl.so
-
LoadModule mime_module /opt/freeware/lib/httpd/modules/mod_mime.so
LoadModule dav_module /opt/freeware/lib/httpd/modules/mod_dav.so
LoadModule status_module /opt/freeware/lib/httpd/modules/mod_status.so
--- 256,261 ----
***************
*** 311,318 ****
# when the value of (unsigned)Group is above 60000;
# don't use Group #-1 on these systems!
#
! User nobody
! Group #-1
--- 308,315 ----
# when the value of (unsigned)Group is above 60000;
# don't use Group #-1 on these systems!
#
! User apache
! Group apache
***************
*** 321,327 ****
# e-mailed. This address appears on some server-generated pages, such
# as error documents. e.g. admin@your-domain.com
#
! ServerAdmin you@example.com
#
# ServerName gives the name and port that the server uses to identify itself.
--- 318,324 ----
# e-mailed. This address appears on some server-generated pages, such
# as error documents. e.g. admin@your-domain.com
#
! ServerAdmin root@localhost
#
# ServerName gives the name and port that the server uses to identify itself.
***************
*** 518,524 ****
# logged here. If you *do* define an error logfile for a
# container, that host's errors will be logged there and not here.
#
! ErrorLog /var/logs/error_log
#
# LogLevel: Control the number of messages logged to the error_log.
--- 515,521 ----
# logged here. If you *do* define an error logfile for a
# container, that host's errors will be logged there and not here.
#
! ErrorLog /var/log/httpd/error_log
#
# LogLevel: Control the number of messages logged to the error_log.
***************
*** 537,543 ****
LogFormat "%{User-agent}i" agent
# You need to enable mod_logio.c to use %I and %O
! #LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
#
# The location and format of the access logfile (Common Logfile Format).
--- 534,540 ----
LogFormat "%{User-agent}i" agent
# You need to enable mod_logio.c to use %I and %O
! LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
#
# The location and format of the access logfile (Common Logfile Format).
***************
*** 546,552 ****
# define per- access logfiles, transactions will be
# logged therein and *not* in this file.
#
! CustomLog /var/logs/access_log common
#
# If you would like to have agent and referer logfiles, uncomment the
--- 543,549 ----
# define per- access logfiles, transactions will be
# logged therein and *not* in this file.
#
! CustomLog /var/log/httpd/access_log common
#
# If you would like to have agent and referer logfiles, uncomment the
***************
*** 604,634 ****
#
- # This should be changed to the ServerRoot/manual/. The alias provides
- # the manual, even if you choose to move your DocumentRoot. You may comment
- # this out if you do not care for the documentation.
- #
- AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru|tr))?(/.*)?$ "/var/www/manual$1"
-
-
- Options Indexes
- AllowOverride None
- Order allow,deny
- Allow from all
-
-
- SetHandler type-map
-
- # .tr is text/troff in mime.types!
-
- ForceType text/html
-
-
- SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|ru|tr)/ prefer-language=$1
- RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|ru|tr)){2,}(/.*)?$ /manual/$1$2
-
-
- #
# ScriptAlias: This controls which directories contain server scripts.
# ScriptAliases are essentially the same as Aliases, except that
# documents in the realname directory are treated as applications and
--- 601,606 ----
***************
*** 643,649 ****
# Additional to mod_cgid.c settings, mod_cgid has Scriptsock
# for setting UNIX socket for communicating with cgid.
#
! #Scriptsock /var/logs/cgisock
#
--- 615,621 ----
# Additional to mod_cgid.c settings, mod_cgid has Scriptsock
# for setting UNIX socket for communicating with cgid.
#
! Scriptsock /var/log/httpd/cgisock
#
***************
*** 1050,1056 ****
# Bring in additional module-specific configurations
#
! Include conf/ssl.conf
--- 1022,1028 ----
# Bring in additional module-specific configurations
#
! # Include conf/ssl.conf
***************
*** 1086,1088 ****
--- 1058,1064 ----
# ErrorLog /var/logs/dummy-host.example.com-error_log
# CustomLog /var/logs/dummy-host.example.com-access_log common
#
+
+ # Local access to the Apache HTTP Server Manual
+ #Include conf/httpd-manual.conf
+