Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 210

Show
Ignore:
Timestamp:
12/15/06 22:30:59 (2 years ago)
Author:
rats
Message:

- MAKEFILE: * Fixed Error

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configs/Makefile

    r201 r210  
    1212                cd ./database && $(MAKE) install ; cd .. ;  \ 
    1313                cd ./init.d && $(MAKE) install ; cd .. ; \ 
    14                 cd ./fcgi && $(MAKE) install ; cd .. ; \ 
    1514                cd ./postfix && $(MAKE) install ; cd .. ; \ 
    1615                cd ./courier && $(MAKE) install ; cd .. ; \ 

  • trunk/engine/setup/vhcs2-setup

    r207 r210  
    879879 
    880880        ## FCGI Master user 
    881     ($fuid, $fgid) = ($main::cfg{'APACHE_SUEXEC_MIN_UID'}, $main::cfg{'APACHE_SUEXEC_MIN_GID'}); 
    882     ($uid, $gid) = (undef, undef); 
     881    my ($muid, $mgid) = ($main::cfg{'APACHE_SUEXEC_MIN_UID'}, $main::cfg{'APACHE_SUEXEC_MIN_GID'}); 
     882    my ($vuuid, $vuugid) = (undef, undef); 
    883883 
    884884    @udata = (); 
    885885    @gdata = (); 
    886886 
    887     @udata = getpwnam($fuid); 
    888     @gdata = getgrnam($fgid); 
     887    @udata = getpwnam($muid); 
     888    @gdata = getgrnam($mgid); 
    889889 
    890890        if (scalar(@gdata) == 0) { # we have not this one group data; 
    891         my $cmd = "$main::cfg{'CMD_GROUPADD'} $fgid"; 
     891        my $cmd = "$main::cfg{'CMD_GROUPADD'} $mgid"; 
    892892        $rs = sys_command($cmd); 
    893893 
    894894        return $rs if ($rs != 0); 
    895895 
    896         @gdata = getgrnam($fgid); 
    897     } 
    898  
    899     my $mgid = $gdata[2]; 
     896        @gdata = getgrnam($mgid); 
     897    } 
     898 
     899    $vugid = $gdata[2]; 
    900900 
    901901    if (scalar(@udata) == 0) { # we have not this one user data; 
    902         my $cmd = "$main::cfg{'CMD_USERADD'} -m -c vu-master -g $gid -s /bin/false $fuid"; 
     902        my $cmd = "$main::cfg{'CMD_USERADD'} -m -c vu-master -g $mgid -s /bin/false $muid"; 
    903903        $rs = sys_command($cmd); 
    904904 
    905905        return $rs if ($rs != 0); 
    906906 
    907         @udata = getpwnam($fuid); 
    908     } 
    909  
    910     my $muid = $udata[2]; 
    911     $main::ua{'vu_uid'} = $muid; 
    912     $main::ua{'vu_gid'} = $mgid; 
     907        @udata = getpwnam($muid); 
     908    } 
     909 
     910    $vuuid = $udata[2]; 
     911    $main::ua{'vu_uid'} = $vuuid; 
     912    $main::ua{'vu_gid'} = $vugid; 
    913913        ## 
    914914 
    …… 
    15331533    return $rs if ($rs != 0); 
    15341534 
    1535     my %tag_hash = ( 
     1535    %tag_hash = ( 
    15361536                    '{WWW_DIR}' => $main::cfg{'ROOT_DIR'}, 
    15371537                    '{DMN_NAME}' => "vhcs2",