Ticket #1155: patch-010408

Index: docs/FreeBSD/INSTALL
===================================================================
--- docs/FreeBSD/INSTALL        (revision 1093)
+++ docs/FreeBSD/INSTALL        (working copy)
@@ -16,11 +16,11 @@
 ================================================================================
 1) Version Info
 ---------------
-ispCP ω Version:       1.0.0 RC4
-INSTALL Script:                2.0
-Maintainer:
-Homepage:                      http://www.isp-contol.net
-Linux Distros:         FreeBSD
+ispCP ω Versio :       1.0.0 RC4
+INSTALL Script : 2.0
+Maintainer     : 
+Homepage       : http://www.isp-contol.net
+Distros                : FreeBSD
 
 ================================================================================
 2) Requirements
@@ -32,10 +32,9 @@
 100 MB disk space (only for install of ispCP ω)
 Debian (or even any other *NIX-Distribution)
 
-All FreeBSD required packages are listed in
-./docs/FreeBSD/freebsd-packages
+All FreeBSD required packages are listed in docs/FreeBSD/freebsd-packages
 
-The configuration is costumised for use with apache 2.2.x version using suexec
+The configuration is customised for use with apache 2.2.x version using suexec
 module enable.
 ================================================================================
 3) Introduction
@@ -63,7 +62,7 @@
        # cd ./ispcp-omega-1.0.0
 
 3. Install the required modules
-   see: ./docs/FreeBSD/freebsd-packages
+   see: docs/FreeBSD/freebsd-packages
 
 4. (optional) Check the ispcp.conf and adapt it to your requirements.
    An overview over the variables you can find in the FAQ on
Index: docs/FreeBSD/freebsd-packages
===================================================================
--- docs/FreeBSD/freebsd-packages       (revision 1093)
+++ docs/FreeBSD/freebsd-packages       (working copy)
@@ -1,80 +1,72 @@
-apr
-apr-util
-bash
-bzip2
-c-client
-courier-imap
-courier-pop3
-courier-utils
-curl
-cyrus-sasl-2.1.21p3
-db-4.2.52p11
-expat
-freetype
-gdbm
-gettext
-gmp
-jpeg-6bp3
-libghttp
-libiconv
-libltdl
-libmcrypt
-libxml
-mhash
-mtr-0.72-no_x11
-mysql-client
-mysql-server
-neon
-p5-Compress-Zlib
-p5-Crypt-Blowfish
-p5-Crypt-CBC
-p5-Crypt-DES
-p5-Crypt-PasswdMD5
-p5-Crypt-SSLeay
-p5-DBD-mysql
-p5-DBI
-p5-Digest-HMAC
-p5-Digest-SHA1
-p5-HTML-Parser
-p5-HTML-Tagset
-p5-HTTP-GHTTP
-p5-IO-stringy
-p5-MIME-tools
-p5-Mail-SpamAssassin-3.1.8
-p5-Mail-Tools
-p5-Net-DNS
-p5-Net-Daemon
-p5-Net-IP
-p5-PlRPC
-p5-URI
-p5-libwww
-p5-Term-ReadPassword
-pcre
-pdflib
-php4-bz2
-php4-core
-php4-curl
-php4-dbx
-php4-domxml
-php4-extensions
-php4-filepro
-php4-gd-4.4.1p5-no_x11
-php4-gmp
-php4-imap
-php4-mcrypt
-php4-mhash
-php4-mysql
-php4-pdf
-php4-pear
-php4-shmop
-php4-xmlrpc
-php4-xslt
-png
-postfix-2.3.7-sasl2
-recode
-sablotron
-subversion
-t1lib
-tiff
-unzip
-wget
+=-=-=-= BASIC REQUIRED PACKAGE/PORTS =-=-=-= last update 20080331
+
+Apache 2.2.x           Web System
+       x suexec        ( Recomended )
+       + mod_cband     for bandwitdh management
+       o mod_php       WARNING: security risk for hosting
+       + mod_fastcgi   ( Recomended )
+Proftpd                        FTP System
+       x IPV6          IP v6 support ( but disable by ispcp )
+       x mysql         Database module
+       x quota         quota module
+       x ratio         ratio module
+       x ctrls         control module
+       - delay         Not Available in ports
+       - ctrls_admin   Not Available in ports
+Postfix                        Email System
+Bash                   Shell compatibility with Main Version
+courier-imap           IMAP system
+       x userdb        For use with userdb ( ispcp default )
+       x mysql         For use with mysql
+courier-pop3           IMAP POP3 system
+mysql-client           Database system
+mysql-server           Database system
+Perl                   =-=-=-= PERL MODULE =-=-=-=
+       + Compress-Zlib
+       + Crypt-Blowfish
+       + Crypt-CBC
+       + Crypt-DES
+       + Crypt-PasswdMD5
+       + Crypt-SSLeay
+       + DBD-mysql
+       + DBI
+       + Digest-HMAC
+       + Digest-SHA1
+       + HTML-Parser
+       + HTML-Tagset
+       + HTTP-GHTTP    
+       + IO-stringy
+       + MIME-tools
+       + Mail-Tools
+       + Net-DNS
+       + Net-Daemon
+       + Net-IP
+       + PlRPC
+       + URI
+       + libwww
+       + Term-ReadPassword
+PHP                    =-=-=-= PHP PACKAGE =-=-=-=
+       x apache        Build Apache module
+       x CLI
+       x CGI
+       x suhosin
+       x fastcgi
+PHP-Extensions
+       x pcre
+       x bz2
+       x core
+       x curl
+       x dbx
+       x domxml
+       x filepro
+       x gd
+       x imap
+       x mcrypt
+       x mhash
+       x mysql
+       x pear
+       x shmop
+       x xmlrpc
+       x xslt
+       x session
+awstats
Index: configs/freebsd/logrotate/BSDmakefile
===================================================================
--- configs/freebsd/logrotate/BSDmakefile       (revision 1093)
+++ configs/freebsd/logrotate/BSDmakefile       (working copy)
@@ -1,4 +1,4 @@
-.include <../../../../Makefile.fbsd>
+.include <../../../Makefile.fbsd>
 
 install:
 
Index: configs/freebsd/apache/fastcgi.conf
===================================================================
--- configs/freebsd/apache/fastcgi.conf (revision 1093)
+++ configs/freebsd/apache/fastcgi.conf (working copy)
@@ -19,7 +19,7 @@
 
 <IfModule mod_fastcgi.c>
        FastCgiWrapper On
-       FastCgiIpcDir /var/lib/apache2/fastcgi
+       FastCgiIpcDir /var/run/fastcgi
 
         FastCgiConfig -minProcesses 1 \
                       -maxProcesses 400 \
@@ -46,4 +46,4 @@
 
        Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter
        AddType application/x-httpd-php .php .php{PHP_VERSION}
-</IfModule>
\ No newline at end of file
+</IfModule>
Index: configs/freebsd/apache/BSDmakefile
===================================================================
--- configs/freebsd/apache/BSDmakefile  (revision 1093)
+++ configs/freebsd/apache/BSDmakefile  (working copy)
@@ -1,4 +1,4 @@
-.include <../../../../Makefile.fbsd>
+.include <../../../Makefile.fbsd>
 
 APACHE_EXT_CONF=$(INST_PREF)/usr/local/etc/apache22/Includes
 APACHE_MOD_CONF=$(INST_PREF)/usr/local/etc/apache22/extra
@@ -12,7 +12,7 @@
        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/ispcp
 
        cp ./httpd.conf ./working/ispcp.conf
-       cp ./fastcgi.conf ./working/fastcgi_ispcp.conf
+       #cp ./fastcgi.conf ./working/fastcgi_ispcp.conf
        cp ./00_master.conf $(SYSTEM_CONF)/apache22
        cp ./01_awstats.conf $(SYSTEM_CONF)/apache22
        cp ./httpd.conf $(SYSTEM_CONF)/apache22
Index: configs/freebsd/ispcp.conf
===================================================================
--- configs/freebsd/ispcp.conf  (revision 1093)
+++ configs/freebsd/ispcp.conf  (working copy)
@@ -8,7 +8,7 @@
 # Misc config variables
 #
 
-BuildDate = 20080331
+BuildDate = 20080401
 
 Version = 1.0.0 RC5 OMEGA
 
@@ -74,7 +74,7 @@
 
 CMD_RM = /bin/rm
 
-CMD_SHELL = /bin/bash
+CMD_SHELL = /usr/local/bin/bash
 
 CMD_TAR = /bin/tar
 
@@ -105,7 +105,7 @@
 
 DATABASE_DIR = /var/db/mysql
 
-CMD_MYSQLDUMP = /usr/bin/mysqldump
+CMD_MYSQLDUMP = /usr/local/bin/mysqldump
 
 DATABASE_UTF8 = yes
 
@@ -117,7 +117,7 @@
 
 LOG_DIR = /var/log/ispcp
 
-PHP_STARTER_DIR = /usr/local/www/fcgi
+PHP_STARTER_DIR = /usr/local/www/data/fcgi
 
 ROOT_DIR = /usr/local/www/ispcp
 
@@ -129,7 +129,7 @@
 
 APACHE_WWW_DIR = /usr/local/www/data
 
-SCOREBOARDS_DIR = /var/www/scoreboards
+SCOREBOARDS_DIR = /usr/local/www/scoreboards
 
 # Select Zipping Algorithm for Backups
 # Supported: gzip, bzip2
Index: configs/freebsd/cron.d/BSDmakefile
===================================================================
--- configs/freebsd/cron.d/BSDmakefile  (revision 1093)
+++ configs/freebsd/cron.d/BSDmakefile  (working copy)
@@ -27,7 +27,7 @@
 #
 #    http://isp-control.net
 #
-.include <../../../../Makefile.fbsd>
+.include <../../../Makefile.fbsd>
 
 install:
 
Index: configs/freebsd/database/BSDmakefile
===================================================================
--- configs/freebsd/database/BSDmakefile        (revision 1093)
+++ configs/freebsd/database/BSDmakefile        (working copy)
@@ -1,4 +1,4 @@
-.include <../../../../Makefile.fbsd>
+.include <../../../Makefile.fbsd>
 
 install:
 
Index: configs/freebsd/init.d/ispcp_daemon
===================================================================
--- configs/freebsd/init.d/ispcp_daemon (revision 1093)
+++ configs/freebsd/init.d/ispcp_daemon (working copy)
@@ -39,7 +39,7 @@
 # Note: do not modify any of these vars here, use /etc/default/$NAME instead
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/var/www/ispcp/daemon/ispcp_daemon
+DAEMON=/usr/local/www/ispcp/daemon/ispcp_daemon
 PID=/var/run/ispcp-daemon.pid
 NAME=ispcp_daemon
 DESC=ispcp_daemon
Index: configs/freebsd/init.d/BSDmakefile
===================================================================
--- configs/freebsd/init.d/BSDmakefile  (revision 1093)
+++ configs/freebsd/init.d/BSDmakefile  (working copy)
@@ -1,16 +1,16 @@
-.include <../../../../Makefile.fbsd>
+.include <../../../Makefile.fbsd>
 
 install:
 
        $(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/rc.d
 
-       cp ispcp_daemon $(ROOT_CONF)/rc.d/ispcp_daemon.sh
-       cp ispcp_network $(ROOT_CONF)/rc.d/ispcp_network.sh
+       cp ispcp_daemon $(ROOT_CONF)/rc.d
+       cp ispcp_network $(ROOT_CONF)/rc.d
 
-       chown root:wheel $(ROOT_CONF)/rc.d/ispcp_network.sh $(ROOT_CONF)/rc.d/ispcp_daemon.sh
-       chmod 0755 $(ROOT_CONF)/rc.d/ispcp_network.sh $(ROOT_CONF)/rc.d/ispcp_daemon.sh
+       chown root:wheel $(ROOT_CONF)/rc.d/ispcp_network $(ROOT_CONF)/rc.d/ispcp_daemon
+       chmod 0755 $(ROOT_CONF)/rc.d/ispcp_network $(ROOT_CONF)/rc.d/ispcp_daemon
 
 uninstall:
 
-       rm -f $(ROOT_CONF)/rc.d/ispcp_daemon.sh
-       rm -f $(ROOT_CONF)/rc.d/ispcp_network.sh
+       rm -f $(ROOT_CONF)/rc.d/ispcp_daemon
+       rm -f $(ROOT_CONF)/rc.d/ispcp_network
Index: configs/freebsd/init.d/ispcp_network
===================================================================
--- configs/freebsd/init.d/ispcp_network        (revision 1093)
+++ configs/freebsd/init.d/ispcp_network        (working copy)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
 
 echo "currently not ported to BSD"
 exit 0
Index: configs/freebsd/awstats/BSDmakefile
===================================================================
--- configs/freebsd/awstats/BSDmakefile (revision 1093)
+++ configs/freebsd/awstats/BSDmakefile (working copy)
@@ -1,4 +1,4 @@
-.include <../../../../Makefile.fbsd>
+.include <../../../Makefile.fbsd>
 
 install:
 
Index: configs/freebsd/BSDmakefile
===================================================================
--- configs/freebsd/BSDmakefile (revision 1093)
+++ configs/freebsd/BSDmakefile (working copy)
@@ -1,4 +1,4 @@
-.include <../../../Makefile.fbsd>
+.include <../../Makefile.fbsd>
 
 install:
        cp ./ispcp.conf $(SYSTEM_CONF) ; cd ..
Index: configs/freebsd/courier/BSDmakefile
===================================================================
--- configs/freebsd/courier/BSDmakefile (revision 1093)
+++ configs/freebsd/courier/BSDmakefile (working copy)
@@ -1,4 +1,4 @@
-.include <../../../../Makefile.fbsd>
+.include <../../../Makefile.fbsd>
 
 ROOT_COURIER_CONF=$(ROOT_CONF)/courier-imap
 
Index: configs/freebsd/fcgi/BSDmakefile
===================================================================
--- configs/freebsd/fcgi/BSDmakefile    (revision 1093)
+++ configs/freebsd/fcgi/BSDmakefile    (working copy)
@@ -1,4 +1,4 @@
-.include <../../../../Makefile.fbsd>
+.include <../../../Makefile.fbsd>
 
 install:
 
Index: configs/freebsd/bind/BSDmakefile
===================================================================
--- configs/freebsd/bind/BSDmakefile    (revision 1093)
+++ configs/freebsd/bind/BSDmakefile    (working copy)
@@ -1,4 +1,4 @@
-.include <../../../../Makefile.fbsd>
+.include <../../../Makefile.fbsd>
 
 install:
 
Index: configs/freebsd/postfix/BSDmakefile
===================================================================
--- configs/freebsd/postfix/BSDmakefile (revision 1093)
+++ configs/freebsd/postfix/BSDmakefile (working copy)
@@ -1,4 +1,4 @@
-.include <../../../../Makefile.fbsd>
+.include <../../../Makefile.fbsd>
 
 ROOT_POSTFIX_CONF=$(ROOT_CONF)/postfix
 
Index: configs/freebsd/proftpd/BSDmakefile
===================================================================
--- configs/freebsd/proftpd/BSDmakefile (revision 1093)
+++ configs/freebsd/proftpd/BSDmakefile (working copy)
@@ -1,4 +1,4 @@
-.include <../../../../Makefile.fbsd>
+.include <../../../Makefile.fbsd>
 
 install:
 
Index: Makefile.fbsd
===================================================================
--- Makefile.fbsd       (revision 1093)
+++ Makefile.fbsd       (working copy)
@@ -38,9 +38,9 @@
 SYSTEM_CONF=$(INST_PREF)/usr/local/etc/ispcp
 SYSTEM_LOG=$(INST_PREF)/var/log/ispcp
 SYSTEM_APACHE_BACK_LOG=$(INST_PREF)/usr/local/www/logs/backup
-SYSTEM_VIRTUAL=$(INST_PREF)/usr/local/www/data
+SYSTEM_VIRTUAL=$(INST_PREF)/usr/local/www/data/virtual
 SYSTEM_AWSTATS=$(INST_PREF)/usr/local/www/awstats
-SYSTEM_FCGI=$(INST_PREF)/usr/local/www/fcgi
+SYSTEM_FCGI=$(INST_PREF)/usr/local/www/data/fcgi
 SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
 SYSTEM_MAKE_DIRS=/bin/mkdir -p
 
Index: engine/setup/reset-setup
===================================================================
--- engine/setup/reset-setup    (revision 1093)
+++ engine/setup/reset-setup    (working copy)
@@ -38,7 +38,7 @@
 use warnings;
 
 ## Variables
-my ($rs, $sql, $rdata) = (undef, undef, undef);
+my ($rs, $sql, $rdata, $delete_cmd ) = (undef, undef, undef,undef );
 my $user_prefix = $main::cfg{'APACHE_SUEXEC_USER_PREF'};
 my $master_user = $main::cfg{'APACHE_SUEXEC_MIN_UID'};
 my $user_delete        = $main::cfg{'CMD_USERDEL'};
@@ -47,18 +47,23 @@
 ## MAIN
 print STDOUT "Re-setting ISPCP Setup!\n";
 print STDOUT "========================\n";
-my $delete_cmd = "$user_delete -r $user_prefix$master_user";
-$rs = sys_command($delete_cmd);
 
-my $delete_fcgi = "$main::cfg{'CMD_RM'} -r $main::cfg{'PHP_STARTER_DIR'}/master";
-$rs = sys_command($delete_fcgi);
+if ($main::cfg{'ROOT_GROUP'} eq "wheel") {
+       $delete_cmd = "rmuser -y $user_prefix$master_user";
+       $rs = sys_command($delete_cmd);
+} else {
+       $delete_cmd = "$user_delete -r $user_prefix$master_user";
+       $rs = sys_command($delete_cmd);
+       my $delete_fcgi = "$main::cfg{'CMD_RM'} -r $main::cfg{'PHP_STARTER_DIR'}/master";
+       $rs = sys_command($delete_fcgi);
+}
 
 $sql = "DROP DATABASE IF EXISTS $database";
 ($rs, $rdata) = doSQL($sql);
+
 if ($rs != 0) {
        print STDOUT "An error occured!\n";
        print STDOUT "$rdata\n";
-}
-else {
+} else {
        print STDOUT "done!\n";
 }