* changed Web/APACHE into a choice Web/WEB

* PHP and ASP.NET adapted to new Web/WEB

pkgsel/Services/Web/00-Web.none.choice

@@ -0,0 +1,3 @@
+#Description: No Web Server
+#Default: none
+#Dependencies: NETWORK

pkgsel/Services/Web/PHP.ask

@@ -1,4 +1,4 @@
-#Dependencies: APACHE
+#Dependencies: WEB!='' WEB!=none
 
 X php
 X libmcrypt

pkgsel/Services/Web/00-apache.ask → pkgsel/Services/Web/Web.apache.choice

@@ -1,4 +1,4 @@
-#Description: Web Server
+#Description: Apache full-featured Web Server
 #Dependencies: NETWORK
 
 X apr

pkgsel/Services/Web/apache.conf → pkgsel/Services/Web/Web.conf

@@ -11,6 +11,11 @@
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
 # --- T2-COPYRIGHT-NOTE-END ---
-SDECFGSET_PKG_APACHE_SUEXEC=1
-SDECFGSET_PKG_APACHE_DOCROOT="/srv"
+
+case "$SDECFG_TRG_MNEMOSYNE_WEB" in
+	apache)
+		SDECFGSET_PKG_APACHE_SUEXEC=1
+		SDECFGSET_PKG_APACHE_DOCROOT="/srv"
+		;;
+esac
 

pkgsel/Services/Web/mono.ask

@@ -1,6 +1,6 @@
 #Description: ASP.NET
 #Variable: ASPNET
-#Dependencies: APACHE
+#Dependencies: WEB='apache'
 #Forced: MONO
 
 X mod_mono