diff --git a/Adaptors/Apache2.2/apache.conf b/Adaptors/Apache2.2/apache.conf index 17e3d0e..af70636 100644 --- a/Adaptors/Apache2.2/apache.conf +++ b/Adaptors/Apache2.2/apache.conf @@ -12,7 +12,21 @@ WebObjectsDocumentRoot LOCAL_LIBRARY_DIR/WebServer/Documents # You can change the 'cgi-bin' part of WebObjectsAlias to whatever you # prefer (such as Apps), but the 'WebObjects' part is required. -WebObjectsAlias /cgi-bin/WebObjects +WebObjectsAlias /Apps/WebObjects + +# Allow connection to WebObjects URL + + Allow from all + SetOutputFilter DEFLATE + + +Alias /WebObjects/ LOCAL_LIBRARY_DIR/WebServer/Documents/WebObjects/ + + + Options FollowSymLinks + Order allow,deny + Allow from all + # Here are the 3 possible configuration modes. # The apache module uses one of them to get information diff --git a/Adaptors/make.config b/Adaptors/make.config index 30e158a..a2b58ba 100644 --- a/Adaptors/make.config +++ b/Adaptors/make.config @@ -4,7 +4,8 @@ # misc. configuration info. that is needed by other project makefiles. # Set the platform you are building on -ADAPTOR_OS = MACOS +ADAPTOR_OS = LINUX +OS_VERSION = ALTLINUX # Define the OS. ifeq "" "${OS}" @@ -85,6 +86,12 @@ ADAPTORS = CGI Apache2 APXS = /usr/sbin/apxs APACHEINCLUDE_DIR = /usr/include/httpd +else +ifeq "ALTLINUX" "$(OS_VERSION)" +ADAPTORS = Apache2.2 +APXS = /usr/sbin/apxs2 +APACHEMODULE_DIR = /usr/lib/apache2/modules + # OTHER LINUX else @@ -93,6 +100,7 @@ APXS = $(shell bash -c 'if [ -e /usr/bin/apxs2 ]; then echo /usr/bin/apxs2;else endif endif +endif #end Linux ifeq "FreeBSD" "${OS}"