Menu
▾
▴
[Devil-linux-commit] build/scripts/configuration mod_perl.config, 1.1.2.1, 1.1.2.2 php.config, 1.1, 1.1.2.1 httpd.config, 1.1, 1.1.2.1 sarg.config, 1.1, 1.1.2.1 vsftpd.config, 1.2, 1.2.4.1 thttpd.config, 1.2, 1.2.4.1
Update of /cvsroot/devil-linux/build/scripts/configuration In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv3361/configuration Modified Files: Tag: rel-1-2-patches mod_perl.config php.config httpd.config sarg.config vsftpd.config thttpd.config Log Message: done some "backports" of menuconfig from 1.3-branch Index: sarg.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/sarg.config,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- sarg.config 20 Oct 2003 17:45:50 -0000 1.1 +++ sarg.config 30 Jul 2007 13:42:28 -0000 1.1.2.1 @@ -5,4 +5,4 @@ # # http://www.devil-linux.org -menu_add "Networking|Services" bool "Sarg (Squid Analysis Report Generator)" CONFIG_SARG +menu_add "Networking|WWW" bool "Sarg (Squid Analysis Report Generator)" CONFIG_SARG Index: mod_perl.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/mod_perl.config,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- mod_perl.config 3 Jul 2006 02:47:02 -0000 1.1.2.1 +++ mod_perl.config 30 Jul 2007 13:42:28 -0000 1.1.2.2 @@ -1,7 +1,12 @@ #!/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 Index: vsftpd.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/vsftpd.config,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- vsftpd.config 2 Oct 2003 15:58:26 -0000 1.2 +++ vsftpd.config 30 Jul 2007 13:42:28 -0000 1.2.4.1 @@ -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: httpd.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/httpd.config,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- httpd.config 14 Oct 2003 02:04:31 -0000 1.1 +++ httpd.config 30 Jul 2007 13:42:28 -0000 1.1.2.1 @@ -5,4 +5,15 @@ # # 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_HTTPD_MPM" && CONFIG_HTTPD_MPM="prefork" + menu_add "Networking|WWW|Apache Config" list "MPM-Type" CONFIG_HTTPD_MPM prefork worker event + + test -z "$CONFIG_HTTPD_NONPORTATOM" && CONFIG_HTTPD_NONPORTATOM="n" + menu_add "Networking|WWW|Apache Config" bool "enable nonportable atomics" CONFIG_HTTPD_NONPORTATOM + + test -z "$CONFIG_HTTPD_SUEXEC" && CONFIG_HTTPD_SUEXEC="y" + menu_add "Networking|WWW|Apache Config" bool "enable suexec" CONFIG_HTTPD_SUEXEC +fi Index: thttpd.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/thttpd.config,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -d -r1.2 -r1.2.4.1 --- thttpd.config 2 Oct 2003 15:58:26 -0000 1.2 +++ thttpd.config 30 Jul 2007 13:42:28 -0000 1.2.4.1 @@ -5,4 +5,4 @@ # # http://www.devil-linux.org -menu_add "Networking|Services" bool "thttpd (small, fast and secure webserver)" CONFIG_THTTPD +menu_add "Networking|WWW" bool "thttpd (small, fast and secure webserver)" CONFIG_THTTPD Index: php.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/php.config,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 --- php.config 16 Oct 2003 02:21:37 -0000 1.1 +++ php.config 30 Jul 2007 13:42:28 -0000 1.1.2.1 @@ -5,4 +5,4 @@ # # http://www.devil-linux.org -test "$CONFIG_HTTPD" = "y" && menu_add "Networking|Services" bool "PHP" CONFIG_PHP +test "$CONFIG_HTTPD" = "y" && menu_add "Networking|WWW|Apache Config" bool "PHP" CONFIG_PHP |
