Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1057

Show
Ignore:
Timestamp:
03/14/08 16:42:33 (9 months ago)
Author:
rats
Message:

see CHANGELOG!

ispCP 1.0.0 RC4 ready for release?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r1056 r1057  
    442008-03-13 Benedikt Heintel 
    55        - SETUP: 
     6                * Fixed #942: ERROR: Undefined intput data, bt: |{PHP_VERSION}|, et: |{PHP_VERSION}|, src ! 
     7                * Fixed #1097: (quick fix) ispcp-vrl-traff-correction generates high load on mysql db -> DB locked 
    68                * Fixed #1106: BSDmakefile Setup not copy some of its file 
    79                * Updated: a lot of Makefiles 

  • trunk/configs/dists/centos/apache/Makefile

    r994 r1057  
    2020        cp ./httpd.conf $(SYSTEM_CONF)/apache/working/ispcp.conf 
    2121        cp ./httpd.conf $(SYSTEM_CONF)/apache/parts/ispcp_base.tpl 
     22        cp ./fastcgi.conf $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf 
    2223 
    2324        cp -R $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf $(ROOT_APACHE_CONF)/mods-available/fastcgi_ispcp.conf 

  • trunk/configs/dists/fedora/apache/Makefile

    r1011 r1057  
    2020        cp ./httpd.conf $(SYSTEM_CONF)/apache/working/ispcp.conf 
    2121        cp ./httpd.conf $(SYSTEM_CONF)/apache/parts/ispcp_base.tpl 
     22        cp ./fastcgi.conf $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf 
    2223 
    23         cp ./fastcgi.conf $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf 
    2424        cp ./fastcgi.conf $(SYSTEM_CONF)/apache/conf.d/fastcgi_ispcp.conf 
    2525 

  • trunk/configs/dists/opensuse/apache/Makefile

    r998 r1057  
    1919        cp ./httpd.conf $(SYSTEM_CONF)/apache/working/ispcp.conf 
    2020        cp ./httpd.conf $(SYSTEM_CONF)/apache/parts/ispcp_base.tpl 
    21  
    2221        cp ./fastcgi.conf $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf 
    2322 

  • trunk/configs/dists/redhat/apache/Makefile

    r1007 r1057  
    1717        cp -R ./parts $(SYSTEM_CONF)/apache 
    1818        cp -R ./working $(SYSTEM_CONF)/apache 
     19 
    1920        cp ./httpd.conf $(SYSTEM_CONF)/apache/working/ispcp.conf 
    2021        cp ./httpd.conf $(SYSTEM_CONF)/apache/parts/ispcp_base.tpl 
    21         cp -R ./working/fastcgi_ispcp.conf ${ROOT_APACHE_CONF}/mods-available/fastcgi_ispcp.conf 
     22        cp ./fastcgi.conf $(SYSTEM_CONF)/apache/working/fastcgi_ispcp.conf 
     23 
     24        cp -R fastcgi.conf ${ROOT_APACHE_CONF}/mods-available/fastcgi_ispcp.conf 
    2225 
    2326uninstall: 

  • trunk/engine/ispcp_common_code.pl

    r1056 r1057  
    5353if ($main::db_pass_key eq '{KEY}' || $main::db_pass_iv eq '{IV}') { 
    5454 
    55         print STDERR "\tGenerating database keys, it may take some time, please wait...\n"; 
     55        print STDOUT "\tGenerating database keys, it may take some time, please wait...\n"; 
     56        print STDOUT "\tIf it takes to long, please check http://www.isp-control.net/documentation/frequently_asked_questions/what_does_generating_database_keys_it_may_take_some_time_please_wait..._on_setup_mean\n"; 
    5657 
    5758        $rs = sys_command("perl $main::cfg{'ROOT_DIR'}/keys/rpl.pl $main::cfg{'GUI_ROOT_DIR'}/include/ispcp-db-keys.php $main::cfg{'ROOT_DIR'}/engine/ispcp-db-keys.pl $main::cfg{'ROOT_DIR'}/engine/messager/ispcp-db-keys.pl"); 

  • trunk/engine/traffic/ispcp-vrl-traff-correction

    r912 r1057  
    8585    push_el(\@main::el, 'vrl_traff_correction_engine()', 'Starting...'); 
    8686 
    87     my $sql = "SELECT traff_time, IFNULL( sum( t2.dtraff_mail ) , 0 ) AS dom_mail_sum, IFNULL( sum( t2.dtraff_pop ) , 0 )  AS dom_pop_sum, IFNULL( sum( t2.dtraff_web ) , 0 ) AS dom_web_sum, ifnull( (t1.bytes_mail_in + t1.bytes_mail_out), 0 ) - IFNULL( sum( t2.dtraff_mail ) , 0 ) AS diff_mail, ifnull( (t1.bytes_pop_in + t1.bytes_pop_out), 0 ) - IFNULL( sum( t2.dtraff_pop ) , 0 ) AS diff_pop, ifnull( (t1.bytes_web_in +  t1.bytes_web_out), 0 ) - IFNULL( sum( t2.dtraff_web ) , 0 ) AS diff_web FROM server_traffic AS t1 INNER JOIN domain_traffic AS t2 ON t2.dtraff_time = t1.traff_time WHERE t1.correction = 0 and t2.correction = 0 GROUP BY t2.dtraff_time;"; 
     87        # Select traffic for only two hour. 
     88    my $time = time() - (60 * 120); 
     89 
     90    my $sql = "SELECT traff_time, IFNULL( sum( t2.dtraff_mail ) , 0 ) AS dom_mail_sum, IFNULL( sum( t2.dtraff_pop ) , 0 ) AS dom_pop_sum, IFNULL( sum( t2.dtraff_web ) , 0 ) AS dom_web_sum, ifnull( (t1.bytes_mail_in + t1.bytes_mail_out), 0 ) - IFNULL( sum( t2.dtraff_mail ) , 0 ) AS diff_mail, ifnull( (t1.bytes_pop_in + t1.bytes_pop_out), 0 ) - IFNULL( sum( t2.dtraff_pop ) , 0 ) AS diff_pop, ifnull( (t1.bytes_web_in + t1.bytes_web_out), 0 ) - IFNULL( sum( t2.dtraff_web ) , 0 ) AS diff_web FROM server_traffic AS t1 INNER JOIN domain_traffic AS t2 ON t2.dtraff_time = t1.traff_time WHERE t1.traff_time > $time and t2.dtraff_time > $time and t1.correction = 0 and t2.correction = 0 GROUP BY t2.dtraff_time;"; 
    8891 
    8992    ($rs, $rdata1) = doSQL($sql);