[Devil-linux-commit] build/scripts/configuration httpd.config, 1.1, 1.2 mod_perl.config, 1.2, 1.3 vsftpd.config, 1.2, 1.3

[Björn R. <br...@us...>]

Update of /cvsroot/devil-linux/build/scripts/configuration
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv22271/configuration

Modified Files:
	httpd.config mod_perl.config vsftpd.config 
Log Message:
added some config-settings for Apache (choose MPM, cache, WebDAV, ...)


Index: httpd.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/httpd.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- httpd.config	14 Oct 2003 02:04:31 -0000	1.1
+++ httpd.config	25 Jul 2007 13:44:02 -0000	1.2
@@ -5,4 +5,23 @@
 #
 # http://www.devil-linux.org
 
-menu_add "Networking|Services" bool "Apache Webserver" CONFIG_HTTPD
+menu_add "Networking|WWW" bool "Apache Webserver" CONFIG_HTTPD
+
+if [ "$CONFIG_HTTPD" = "y" ]; then
+        test -z "$CONFIG_HTTP_MPM" && CONFIG_HTTP_MPM="prefork"
+        menu_add "Networking|WWW|Apache Config" list "MPM-Type" CONFIG_HTTP_MPM prefork worker event
+
+        test -z "$CONFIG_HTTP_NONPORTATOM" && CONFIG_HTTP_NONPORTATOM="n"
+        menu_add "Networking|WWW|Apache Config" bool "enable nonportable atomics" CONFIG_HTTP_NONPORTATOM
+
+        test -z "$CONFIG_HTTP_CACHE" && CONFIG_HTTP_CACHE="y"
+        menu_add "Networking|WWW|Apache Config" bool "enable cache (mem & disk)" CONFIG_HTTP_CACHE
+
+	test -z "$CONFIG_HTTP_PROXY" && CONFIG_HTTP_PROXY="y"
+	menu_add "Networking|WWW|Apache Config" bool "enable proxy (including balancer)" CONFIG_HTTP_PROXY
+
+	test -z "$CONFIG_HTTP_DAV" && CONFIG_HTTP_DAV="y"
+	menu_add "Networking|WWW|Apache Config" bool "enable WebDAV" CONFIG_HTTP_DAV
+
+fi
+

Index: vsftpd.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/vsftpd.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vsftpd.config	2 Oct 2003 15:58:26 -0000	1.2
+++ vsftpd.config	25 Jul 2007 13:44:02 -0000	1.3
@@ -5,4 +5,4 @@
 #
 # http://www.devil-linux.org
 
-menu_add "Networking|Services" bool "vsftpd (small, fast and secure FTP server)" CONFIG_VSFTPD
+menu_add "Networking|WWW" bool "vsftpd (small, fast and secure FTP server)" CONFIG_VSFTPD

Index: mod_perl.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/mod_perl.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mod_perl.config	3 Jul 2006 02:47:12 -0000	1.2
+++ mod_perl.config	25 Jul 2007 13:44:02 -0000	1.3
@@ -1,7 +1,13 @@
 #!/bin/bash
+# $Source$
+# $Revision$
+# $Date$
 #
 # http://www.devil-linux.org
 
-if [ "$CONFIG_HTTPD" = "y" ] && [ "$CONFIG_PERL" = "y" ] ; then 
-    menu_add "Networking|Services" bool "mod_perl for Apache" CONFIG_MOD_PERL
+if [ "$CONFIG_HTTPD" = "y" ]; then
+        if [ "$CONFIG_PERL" = "y" ] ; then
+                menu_add "Networking|WWW|Apache Config" bool "mod_perl for Apache" CONFIG_MOD_PERL
+        fi
 fi
+