Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1319

Show
Ignore:
Timestamp:
08/09/08 09:10:03 (4 months ago)
Author:
rats
Message:

* Fixed #1457: (FreeBSD) Update various FreeBSD Section

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/BSDmakefile

    r1192 r1319  
    7373        cp $(SYSTEM_WEB)/ispcp/engine/messager/ispcp-db-keys.pl $(SYSTEM_ROOT)/engine/messager/ 
    7474        cp $(SYSTEM_WEB)/ispcp/gui/include/ispcp-db-keys.php $(SYSTEM_ROOT)/gui/include/ 
     75        cp $(SYSTEM_WEB)/ispcp/gui/themes/user_logos/* $(SYSTEM_ROOT)/gui/themes/user_logos/ 
    7576        cp $(SYSTEM_WEB)/ispcp/gui/tools/pma/config.inc.php $(SYSTEM_ROOT)/gui/tools/pma/ 
     77 
     78        # Delete old files to avoid security risks 
     79        rm -rf $(SYSTEM_WEB)/ispcp/gui/admin 
     80        rm -rf $(SYSTEM_WEB)/ispcp/gui/client 
     81        rm -rf $(SYSTEM_WEB)/ispcp/gui/include 
     82        rm -rf $(SYSTEM_WEB)/ispcp/gui/orderpanel 
     83        rm -rf $(SYSTEM_WEB)/ispcp/gui/themes 
     84        rm -rf $(SYSTEM_WEB)/ispcp/gui/reseller 
     85        rm -rf $(SYSTEM_WEB)/ispcp/gui/*.php 
     86 
     87        # Backup ispcp.conf and copy the /etc directory into your system (you may make backups): 
     88        mv -v /usr/local/etc/ispcp/ispcp.conf /usr/local/etc/ispcp/ispcp.old.conf 
     89        mv -v /usr/local/etc/proftpd.conf /usr/local/etc/proftpd.old.conf 
     90 
     91        # Copy /usr and /var directories into your system (you may make backups) 
     92        cp -R $(INST_PREF)/usr/* /usr/ 
     93        cp -R $(INST_PREF)/var/* /var/ 
     94.else 
     95        cd ${INST_PREF} && cp -R * / 
    7696.endif 
    77  
    78         cd ${INST_PREF} && cp -R * / 
    7997        rm -rf ${INST_PREF} 
    80  
    81         # 
    82         # 
    83         # If Some error occured please read FAQ first and search at forum in http://www.isp-control.net 
    84         # Go to $(SYSTEM_WEB)/ispcp/engine/setup and type "ispcp-setup" to configure or "ispcp-upgrade"  
    85         # to complete upgrade process 
     98        # 
     99        # 
     100        # If Some error occured please read FAQ first and search at forum in http://www.isp-control.net 
     101        # Go to $(SYSTEM_WEB)/ispcp/engine/setup and type "ispcp-setup" to configure or "ispcp-upgrade" 
     102        # to complete upgrade process 
    86103 
    87104uninstall: 

  • trunk/docs/CentOS/INSTALL

    r1307 r1319  
    227227        # cp -Rv /tmp/ispcp/var/* /var/ 
    228228 
    229 9. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
     2299. Backup ispcp.conf and copy the /etc directory into your system (you may make backups): 
    230230        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
    231231 

  • trunk/docs/Debian/INSTALL

    r1307 r1319  
    192192        # cp -Rv /tmp/ispcp/var/* /var/ 
    193193 
    194 9. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
     1949. Backup ispcp.conf and copy the /etc directory into your system (you may make backups): 
    195195        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
    196196 

  • trunk/docs/Fedora/INSTALL

    r1307 r1319  
    193193        # cp -Rv /tmp/ispcp/var/* /var/ 
    194194 
    195 9. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
     1959. Backup ispcp.conf and copy the /etc directory into your system (you may make backups): 
    196196        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
    197197 

  • trunk/docs/FreeBSD/INSTALL

    r1307 r1319  
    141141        # cp -Rv /tmp/ispcp/var/* /var/ 
    142142 
    143 9. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
     1439. Backup ispcp.conf and copy the /etc directory into your system (you may make backups): 
    144144        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
    145145 

  • trunk/docs/Gentoo/INSTALL

    r1307 r1319  
    138138        # cp -Rv /tmp/ispcp/var/* /var/ 
    139139 
    140 9. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
     1409. Backup ispcp.conf and copy the /etc directory into your system (you may make backups): 
    141141        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
    142142 

  • trunk/docs/OpenBSD/INSTALL

    r1307 r1319  
    244244        # cp -Rv /tmp/ispcp/var/* /var/ 
    245245 
    246 9. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
     2469. Backup ispcp.conf and copy the /etc directory into your system (you may make backups): 
    247247        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
    248248 

  • trunk/docs/OpenSuse/INSTALL

    r1307 r1319  
    182182        # cp -Rv /tmp/ispcp/var/* /var/ 
    183183 
    184 9. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
     1849. Backup ispcp.conf and copy the /etc directory into your system (you may make backups): 
    185185        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
    186186 

  • trunk/docs/RedHat/INSTALL

    r1307 r1319  
    138138        # cp -Rv /tmp/ispcp/var/* /var/ 
    139139 
    140 9. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
     1409. Backup ispcp.conf and copy the /etc directory into your system (you may make backups): 
    141141        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
    142142 

  • trunk/docs/Ubuntu/INSTALL

    r1307 r1319  
    176176        # cp -Rv /tmp/ispcp/var/* /var/ 
    177177 
    178 9. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
     1789. Backup ispcp.conf and copy the /etc directory into your system (you may make backups): 
    179179        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
    180180 

  • trunk/engine/BSDmakefile

    r1103 r1319  
    4444CMD_MAIL_INSTALL=/usr/bin/install -m 0700 -o vmail -g mail 
    4545CMD_DIR_INSTALL=/usr/bin/install -d -o root -g wheel 
    46  
    4746 
    4847install: 
    …… 
    108107        $(CMD_INSTALL) ./setup/ispcp-setup $(SYSTEM_ENGINE_ROOT)/setup 
    109108        $(CMD_INSTALL) ./setup/ispcp-setup-methods.pl $(SYSTEM_ENGINE_ROOT)/setup 
     109        $(CMD_INSTALL) ./setup/ispcp-update $(SYSTEM_ENGINE_ROOT)/setup 
    110110        $(CMD_INSTALL) ./setup/ispcp-uninstall $(SYSTEM_ENGINE_ROOT)/setup 
     111        $(CMD_INSTALL) ./setup/regenerate.sql $(SYSTEM_ENGINE_ROOT)/setup 
    111112        $(CMD_INSTALL) ./setup/vhcs2.4.7-ispcp.sql $(SYSTEM_ENGINE_ROOT)/setup 
    112113        $(CMD_INSTALL) ./setup/vhcs2.4.8-ispcp.sql $(SYSTEM_ENGINE_ROOT)/setup 
    …… 
    115116 
    116117        $(CMD_INSTALL) ./tools/ispcp-httpd-logs-mngr $(SYSTEM_ENGINE_ROOT)/tools/ispcp-httpd-logs-mngr 
    117  
    118118        $(CMD_INSTALL) ./tools/ispcpphptemp.sh $(SYSTEM_ENGINE_ROOT)/tools/ispcpphptemp.sh 
    119119 
    120120        $(CMD_INSTALL) ./traffic/ispcp-srv-traff $(SYSTEM_ENGINE_ROOT)/traffic 
    121121        $(CMD_INSTALL) ./traffic/ispcp-vrl-traff $(SYSTEM_ENGINE_ROOT)/traffic 
    122         $(CMD_INSTALL) ./traffic/ispcp-vrl-traff-SUSE $(SYSTEM_ENGINE_ROOT)/traffic 
    123122        $(CMD_INSTALL) ./traffic/ispcp-vrl-traff-correction $(SYSTEM_ENGINE_ROOT)/traffic 
    124  
    125123 
    126124uninstall: 
    …… 
    128126        rm -rf $(SYSTEM_ENGINE_ROOT) 
    129127        rm -rf ./*~ 
    130  

  • trunk/engine/ispcp-dmn-mngr

    r1301 r1319  
    24212421        # Now we'll proceed system config; 
    24222422        # 
     2423 
     2424        # BSD/NUX Command 
    24232425        if ($main::cfg{'ROOT_GROUP'} eq "wheel") { 
    24242426                $rs = sys_command_rs("$main::cfg{'CMD_CP'} /var/cron/tabs/root $backup_cfg"); 
    …… 
    24282430        return $rs if ($rs != 0); 
    24292431 
     2432        # BSD/NUX Command 
    24302433        if ($main::cfg{'ROOT_GROUP'} eq "wheel") { 
    24312434                $rs = sys_command_rs("$main::cfg{'CMD_CRONTAB'} -u root $working_cfg"); 

  • trunk/engine/ispcp_common_methods.pl

    r1298 r1319  
    20632063                my $cmd = undef; 
    20642064 
    2065         # group data - BSD has another format: 
     2065                # group data - BSD has another format: 
     2066                # BSD/NUX Command 
    20662067                if ($main::cfg{'ROOT_GROUP'} eq "wheel") { 
    20672068                        $cmd = "$main::cfg{'CMD_GROUPADD'} $sys_group -g $sys_gid"; 
    …… 
    20792080 
    20802081                # BSD has another format: 
     2082                # BSD/NUX Command 
    20812083                if ($main::cfg{'ROOT_GROUP'} eq "wheel") { 
    20822084                        $cmd = "$main::cfg{'CMD_USERADD'} $sys_user -c virtual-user -d $homedir -g $sys_group -s /bin/false -u $sys_uid"; 

  • trunk/engine/quota/ispcp-dsk-quota

    r999 r1319  
    106106        my $size = 0; 
    107107 
    108         my $s = `$cmd_du --exclude="backups/$domain_name-*.bz2" --exclude="backups/$domain_name-*.gz" -s -B1 $main::cfg{APACHE_WWW_DIR}/$domain_name`; 
    109  
    110         $s =~ /^(\d+)/; $size += $1; 
    111  
    112         $s = `$cmd_du -s -B1 $main::cfg{MTA_VIRTUAL_MAIL_DIR}/$domain_name`; 
    113  
    114         $s =~ /^(\d+)/; $size += $1; 
     108        # BSD/NUX Command 
     109        if ($main::cfg{'ROOT_GROUP'} eq "wheel") { 
     110 
     111                my $s = `$cmd_du -I "*.gz" -I "*.tar.bz2" -d 0 $main::cfg{APACHE_WWW_DIR}/$domain_name`; 
     112 
     113                $s =~ /^(\d+)/; $size += $1*1024; 
     114 
     115                $s = `$cmd_du -d 0 $main::cfg{MTA_VIRTUAL_MAIL_DIR}/$domain_name`; 
     116 
     117                $s =~ /^(\d+)/; $size += $1*1024; 
     118 
     119        } else { 
     120 
     121                my $s = `$cmd_du --exclude="backups/$domain_name-*.bz2" --exclude="backups/$domain_name-*.gz" -s -B1 $main::cfg{APACHE_WWW_DIR}/$domain_name`; 
     122 
     123                $s =~ /^(\d+)/; $size += $1; 
     124 
     125                $s = `$cmd_du -s -B1 $main::cfg{MTA_VIRTUAL_MAIL_DIR}/$domain_name`; 
     126 
     127                $s =~ /^(\d+)/; $size += $1; 
     128        } 
    115129 
    116130        if ($size > 0) { 
    …… 
    280294                my $sqldb_id     = @$_[0]; 
    281295 
    282                         $size = `$cmd_du -sb --exclude=*.frm $main::cfg{DATABASE_DIR}/$sqldb_name`; 
    283  
    284                         $size =~ /^(\d+)/; $size = $1; 
     296                        # BSD/NUX Command 
     297                        if ($main::cfg{'ROOT_GROUP'} eq "wheel") { 
     298 
     299                                $size = `$cmd_du -I "*.frm" -d 0 $main::cfg{DATABASE_DIR}/$sqldb_name`; 
     300               
     301                                $size =~ /^(\d+)/; $size = $1*1024; 
     302 
     303                        } else { 
     304         
     305                                $size = `$cmd_du -sb --exclude=*.frm $main::cfg{DATABASE_DIR}/$sqldb_name`; 
     306 
     307                                $size =~ /^(\d+)/; $size = $1; 
     308 
     309                        } 
    285310 
    286311            }