- moved /cgi-bin/ ScriptAlias definition to main config, so webapps are able to add...

Changed files:
    apache1-httpd.conf -> 1.14
    apache1-mod_alias.conf -> 1.4

diff --git a/apache1-httpd.conf b/apache1-httpd.conf
index 7d12f0c04aaa28748eb18e993d92eaca7fe96f43..670ef94eb2ad2f56d84de115eda5dd315f4f6e80 100644 (file)
--- a/apache1-httpd.conf
+++ b/apache1-httpd.conf
@@ -35,11 +35,6 @@ Group http
 ServerAdmin root@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 @@ MaxRequestsPerChild 30
 # 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>

diff --git a/apache1-mod_alias.conf b/apache1-mod_alias.conf
index 517b1f9cf31be1b219566d50440dff21dc642e59..ee988c4f00a5779854450366578d99e15dcbe8f4 100644 (file)
--- a/apache1-mod_alias.conf
+++ b/apache1-mod_alias.conf
@@ -26,29 +26,4 @@ Alias /manual/ "/usr/share/apache1-manual/"
        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>