SOURCES: apache1-httpd.conf, apache1-mod_alias.conf - moved /cgi-b...

[glen]

Author: glen                         Date: Fri Dec 30 14:05:02 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- moved /cgi-bin/ ScriptAlias definition to main config, so webapps are able to add their overrides under that path

---- Files affected:
SOURCES:
   apache1-httpd.conf (1.13 -> 1.14) , apache1-mod_alias.conf (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/apache1-httpd.conf
diff -u SOURCES/apache1-httpd.conf:1.13 SOURCES/apache1-httpd.conf:1.14
--- SOURCES/apache1-httpd.conf:1.13	Wed Dec 21 14:22:46 2005
+++ SOURCES/apache1-httpd.conf	Fri Dec 30 15:04:57 2005
@@ -35,11 +35,6 @@
 ServerAdmin root at localhost
 ServerName localhost
 
-# Include other modules and packages config.
-Include conf.d/*.conf
-# Include webapps config
-Include webapps.d/*.conf
-
 ###
 ### IP Address/Port
 ###
@@ -91,3 +86,20 @@
 # These lines here are for packages which still use apxs to activate module.
 # LoadModule access_module modules/mod_access.so
 # AddModule mod_foo.c
+
+# Include other modules and packages config.
+Include conf.d/*.conf
+# Include webapps config
+Include webapps.d/*.conf
+
+# ScriptAlias: This controls which directories contain server scripts.
+<IfModule mod_alias.c>
+	ScriptAlias /cgi-bin/ "/home/services/apache/cgi-bin/"
+
+	<Directory "/home/services/apache/cgi-bin">
+		AllowOverride None
+		Options None
+		Order allow,deny
+		Allow from all
+	</Directory>
+</IfModule>

================================================================
Index: SOURCES/apache1-mod_alias.conf
diff -u SOURCES/apache1-mod_alias.conf:1.3 SOURCES/apache1-mod_alias.conf:1.4
--- SOURCES/apache1-mod_alias.conf:1.3	Wed Dec 21 14:22:46 2005
+++ SOURCES/apache1-mod_alias.conf	Fri Dec 30 15:04:57 2005
@@ -26,29 +26,4 @@
 	allow from 127.0.0.1
 </Directory>
 
-#
-# 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
-# run by the server when requested rather than as documents sent to the client.
-# The same rules about trailing "/" apply to ScriptAlias directives as to
-# Alias.
-#
-ScriptAlias /cgi-bin/ "/home/services/apache/cgi-bin/"
-
-#
-# "/home/services/apache/cgi-bin" should be changed to whatever your
-# ScriptAliased CGI directory exists, if you have that configured.
-#
-<Directory "/home/services/apache/cgi-bin">
-	AllowOverride None
-	Options None
-	Order allow,deny
-	Allow from all
-</Directory>
-
-# Redirect allows you to tell clients about documents which used to exist in
-# your server's namespace, but do not anymore. This allows you to tell the
-# clients where to look for the relocated document.
-# Format: Redirect old-URI new-URL
 </IfModule>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache1-httpd.conf?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SOURCES/apache1-mod_alias.conf?r1=1.3&r2=1.4&f=u