Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1072

Show
Ignore:
Timestamp:
03/22/08 04:44:04 (6 months ago)
Author:
rats
Message:

serveral fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/docs/Debian/debian-packages-lenny

    r1034 r1072  
    6767policyd-weight 
    6868postfix 
    69 postfix-tls 
    7069postgrey 
    7170procmail 

  • trunk/docs/Debian/debian-packages-sarge

    r898 r1072  
    6666php5-mysql 
    6767postfix 
    68 postfix-tls 
    6968postgrey 
    7069procmail 

  • trunk/engine/setup/ispcp-setup-methods.pl

    r1068 r1072  
    14271427        return $rs if ($rs != 0); 
    14281428 
    1429         $cmd = "$main::cfg{'CMD_CP'} -p $vrl_dir/aliases $vrl_dir/domains $vrl_dir/mailboxes 
    1430                                                                         $vrl_dir/transport $vrl_dir/sender-access $main::cfg{'MTA_VIRTUAL_CONF_DIR'}"; 
     1429        $cmd = "$main::cfg{'CMD_CP'} -p $vrl_dir/aliases $vrl_dir/domains $vrl_dir/mailboxes $vrl_dir/transport $vrl_dir/sender-access $main::cfg{'MTA_VIRTUAL_CONF_DIR'}"; 
    14311430        $rs = sys_command($cmd); 
    14321431        return $rs if ($rs != 0); 
    14331432 
    1434         $cmd = "$main::cfg{'CMD_CP'} -p $vrl_dir/aliases $vrl_dir/domains $vrl_dir/mailboxes 
    1435                                                                         $vrl_dir/transport $vrl_dir/sender-access $wrk_dir"; 
     1433        $cmd = "$main::cfg{'CMD_CP'} -p $vrl_dir/aliases $vrl_dir/domains $vrl_dir/mailboxes $vrl_dir/transport $vrl_dir/sender-access $wrk_dir"; 
    14361434        $rs = sys_command($cmd); 
    14371435        return $rs if ($rs != 0); 
    14381436 
    1439         $cmd = "$main::cfg{'CMD_POSTMAP'} $main::cfg{'MTA_VIRTUAL_CONF_DIR'}/aliases $main::cfg{'MTA_VIRTUAL_CONF_DIR'}/domains 
    1440                                                                           $main::cfg{'MTA_VIRTUAL_CONF_DIR'}/mailboxes $main::cfg{'MTA_VIRTUAL_CONF_DIR'}/transport 
    1441                                                                           $main::cfg{'MTA_VIRTUAL_CONF_DIR'}/sender-access &> /tmp/ispcp-setup-services.log"; 
     1437        $cmd = "$main::cfg{'CMD_POSTMAP'} $main::cfg{'MTA_VIRTUAL_CONF_DIR'}/aliases $main::cfg{'MTA_VIRTUAL_CONF_DIR'}/domains $main::cfg{'MTA_VIRTUAL_CONF_DIR'}/mailboxes $main::cfg{'MTA_VIRTUAL_CONF_DIR'}/transport $main::cfg{'MTA_VIRTUAL_CONF_DIR'}/sender-access &> /tmp/ispcp-setup-services.log"; 
    14421438        $rs = sys_command($cmd); 
    14431439        return $rs if ($rs != 0); 

  • trunk/engine/setup/ispcp-uninstall

    r1068 r1072  
    331331    return $rs if ($rs != 0); 
    332332 
    333     $rs = del_dir($main::cfg{'MTA_VIRTUAL_MAIL_DIR'}); 
    334     return $rs if ($rs != 0); 
     333 
     334        # ask to delete directory 
     335        $rdata = 'yes'; 
     336        $qmsg = "\tDelete ".$main::cfg{'MTA_VIRTUAL_MAIL_DIR'}."? [yes]: "; 
     337        print STDOUT $qmsg; 
     338 
     339        $rdata = readline(\*STDIN); 
     340        chop($rdata); 
     341 
     342        if ($rdata eq 'yes' || $rdata eq 'y') { 
     343        $rs = del_dir($main::cfg{'MTA_VIRTUAL_MAIL_DIR'}); 
     344        return $rs if ($rs != 0); 
     345    } 
    335346 
    336347    $rs = del_dir($main::cfg{'LOG_DIR'}); 

  • trunk/engine/setup/ispcp-update

    r1068 r1072  
    664664        $rs = update_conf($old_cfg_file, $cfg_file); 
    665665        if ($rs != 0) { 
    666                 exit_werror("failed to get $cfg_file"); 
     666                exit_werror("failed to get $cfg_file or $old_cfg_file"); 
    667667        } 
    668668 
    …… 
    677677                exit_werror("Storing new ispcp.conf failed!"); 
    678678        } 
    679         print STDOUT "\tdone\n"; 
     679        print STDOUT "done\n"; 
    680680 
    681681        # database upgrade 
    …… 
    727727        my ($rs, $rdata) = (undef, undef); 
    728728 
    729         print STDOUT "\tUpgrading system values ..."; 
    730  
    731729        # update ispcp.conf 
    732730        my $cfg_file = $main::cfg_file; 
    733         my $old_cfg_file = $main::ua{'old_cfg_file'}; 
    734         $rs = update_conf($old_cfg_file, $cfg_file); 
    735         if ($rs != 0) { 
    736                 exit_werror("failed to get $cfg_file"); 
    737         } 
    738  
    739         # save into /etc/ispcp/ispcp.conf 
    740         $rs = store_conf(); 
    741         if ($rs != 0) { 
    742                 exit_werror("Storing new ispcp.conf failed!"); 
    743         } 
    744         print STDOUT "\tdone\n"; 
     731        my $old_cfg_file = undef; 
     732        if (defined($main::ua{'old_cfg_file'})) { 
     733                print STDOUT "\tUpgrading system values..."; 
     734 
     735                $rs = update_conf($old_cfg_file, $cfg_file); 
     736                if ($rs != 0) { 
     737                        exit_werror("failed to get $cfg_file or $old_cfg_file"); 
     738                } 
     739 
     740                # save into /etc/ispcp/ispcp.conf 
     741                $rs = store_conf(); 
     742                if ($rs != 0) { 
     743                        exit_werror("Storing new ispcp.conf failed!"); 
     744                } 
     745                print STDOUT "done\n"; 
     746        } 
    745747 
    746748        # database upgrade 

  • trunk/gui/include/ispcp-config.php

    r1071 r1072  
    2020 
    2121if (@file_exists("/usr/local/etc/ispcp/ispcp.conf")) { 
    22         $cfg = "/usr/local/etc/ispcp/ispcp.conf"; 
     22        $cfgfile = "/usr/local/etc/ispcp/ispcp.conf"; 
    2323} 
    2424else { 
    25         $cfg = "/etc/ispcp/ispcp.conf"; 
    26 } 
    27  
    28 $cfg_obj = new Config($cfg); 
     25        $cfgfile = "/etc/ispcp/ispcp.conf"; 
     26} 
     27 
     28$cfg_obj = new Config($cfgfile); 
    2929 
    3030/* Status not ok -> Try to get the error and display a message */