Attachment 53980 Details for Bug 128226

diff -urN /etc/apache2 /etc/apache2.new

apache.diff (text/plain), 3.12 KB, created by Martin Vidner on 2005-10-13 20:23:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Vidner

Created: 2005-10-13 20:23:21 UTC

Size: 3.12 KB

patch

obsolete

>diff -urN apache2/default-server.conf apache2.new/default-server.conf
>--- apache2/default-server.conf	2005-09-09 20:39:20.000000000 +0200
>+++ apache2.new/default-server.conf	2005-10-13 22:09:10.000000000 +0200
>@@ -9,7 +9,7 @@
> # Configure the DocumentRoot
> #
> <Directory "/srv/www/htdocs">
>-	# Possible values for the Options directive are "None", "All",
>+    	# Possible values for the Options directive are "None", "All",
> 	# or any combination of:
> 	#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
> 	#
>@@ -19,14 +19,14 @@
> 	# The Options directive is both complicated and important.  Please see
> 	# http://httpd.apache.org/docs-2.0/mod/core.html#options
> 	# for more information.
>-	Options None
>-	# AllowOverride controls what directives may be placed in .htaccess files.
>+Options None
>+    	# AllowOverride controls what directives may be placed in .htaccess files.
> 	# It can be "All", "None", or any combination of the keywords:
> 	#   Options FileInfo AuthConfig Limit
>-	AllowOverride None
>-	# Controls who can get stuff from this server.
>-	Order allow,deny
>-	Allow from all
>+AllowOverride None
>+    	# Controls who can get stuff from this server.
>+Order allow,deny
>+ Allow from all
> </Directory>
> 
> # Aliases: aliases can be added as needed (with no limit). The format is 
>@@ -44,10 +44,10 @@
> Alias /icons/ "/usr/share/apache2/icons/"
> 
> <Directory "/usr/share/apache2/icons">
>-	Options Indexes MultiViews
>-	AllowOverride None
>-	Order allow,deny
>-	Allow from all
>+ Options Indexes MultiViews
>+ AllowOverride None
>+ Order allow,deny
>+ Allow from all
> </Directory>
> 
> # ScriptAlias: This controls which directories contain server scripts.
>@@ -63,33 +63,12 @@
> # CGI directory exists, if you have that configured.
> #
> <Directory "/srv/www/cgi-bin">
>-	AllowOverride None
>-	Options +ExecCGI -Includes
>-	Order allow,deny
>-	Allow from all
>+ AllowOverride None
>+ Options +ExecCGI -Includes
>+ Order allow,deny
>+ Allow from all
> </Directory>
> 
>-# UserDir: The name of the directory that is appended onto a user's home
>-# directory if a ~user request is received.
>-#
>-# To disable it, simply remove userdir from the list of modules in APACHE_MODULES 
>-# in /etc/sysconfig/apache2.
>-#
>-<IfModule mod_userdir.c>
>-	# Note that the name of the user directory ("public_html") cannot simply be
>-	# changed here, since it is a compile time setting. The apache package
>-	# would have to be rebuilt. You could work around by deleting
>-	# /usr/sbin/suexec, but then all scripts from the directories would be
>-	# executed with the UID of the webserver.
>-	UserDir public_html
>-	# The actual configuration of the directory is in
>-	# /etc/apache2/mod_userdir.conf.
>-	Include /etc/apache2/mod_userdir.conf
>-	# You can, however, change the ~ if you find it awkward, by mapping e.g.
>-	# http://www.example.com/users/karl-heinz/ --> /home/karl-heinz/public_html/ 
>-	#AliasMatch ^/users/([a-zA-Z0-9-_.]*)/?(.*) /home/$1/public_html/$2
>-</IfModule>
>-
> 
> # Include all *.conf files from /etc/apache2/conf.d/.
> #
>@@ -103,4 +82,6 @@
> 
> # The manual... if it is installed ('?' means it won't complain)
> Include /etc/apache2/conf.d/apache2-manual?conf
>+ServerName Pooh
> 
>+ServerAdmin root@Pooh

Actions: View

Attachments on bug 128226: 53980 | 53981