Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1082

Show
Ignore:
Timestamp:
03/26/08 20:15:33 (6 months ago)
Author:
rats
Message:

* Fixed #1128: fastcgi idle timeout
* Fixed #869: SUGGESTION: check if mysqld is running before starting installer
* Fixed #1135: php and cgi options in the hosting plans

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r1081 r1082  
    33 
    442008-03-26 Benedikt Heintel 
     5        - CONFIGS: 
     6                * Fixed #1128: fastcgi idle timeout 
     7        - DOCU: 
     8                * Fixed #869: SUGGESTION: check if mysqld is running before starting installer 
    59        - GUI: 
    610                * Fixed #1135: php and cgi options in the hosting plans 

  • trunk/configs/apache/fastcgi.conf

    r1047 r1082  
    2222        FastCgiIpcDir /var/lib/apache2/fastcgi 
    2323 
    24         FastCgiConfig -minProcesses 1 \ 
    25                       -maxProcesses 400 \ 
    26                       -maxClassProcesses 5 \ 
    27                       -multiThreshold 80 \ 
    28                       -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
    31                       # -singleThreshold 100 \ 
    32                       # -autoUpdate \ 
    33                       # -pass-header HTTP_AUTHORIZATION 
     24        FastCgiConfig -minProcesses 1 \ 
     25                  -maxProcesses 400 \ 
     26                  -maxClassProcesses 5 \ 
     27                  -multiThreshold 80 \ 
     28                  -killInterval 60 \ 
     29                  -startDelay 5 
     30                  # -singleThreshold 100 \ 
     31                  # -autoUpdate \ 
     32                  # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 
    …… 
    4241 
    4342        <Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter> 
    44             SetHandler fastcgi-script 
    45             Options +ExecCGI 
     43               SetHandler fastcgi-script 
     44               Options +ExecCGI 
    4645        </Location> 
    4746 

  • trunk/configs/apache/fastcgi2.conf

    r1047 r1082  
    2222        FastCgiIpcDir /var/lib/apache2/fastcgi2 
    2323 
    24         FastCgiConfig -minProcesses 1 \ 
    25                       -maxProcesses 400 \ 
    26                       -maxClassProcesses 5 \ 
    27                       -multiThreshold 80 \ 
    28                       -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
    31                       # -singleThreshold 100 \ 
    32                       # -autoUpdate \ 
    33                       # -pass-header HTTP_AUTHORIZATION 
     24        FastCgiConfig -minProcesses 1 \ 
     25                  -maxProcesses 400 \ 
     26                  -maxClassProcesses 5 \ 
     27                  -multiThreshold 80 \ 
     28                  -killInterval 60 \ 
     29                  -startDelay 5 
     30                  # -singleThreshold 100 \ 
     31                  # -autoUpdate \ 
     32                  # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 
    …… 
    4241 
    4342        <Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter> 
    44             SetHandler fastcgi-script 
    45             Options +ExecCGI 
     43               SetHandler fastcgi-script 
     44               Options +ExecCGI 
    4645        </Location> 
    4746 

  • trunk/configs/dists/centos/apache/fastcgi.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/dists/centos/apache/fastcgi2.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/dists/fedora/apache/fastcgi.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/dists/freebsd/apache/fastcgi.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/dists/gentoo/apache/fastcgi.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/dists/gentoo/apache/fastcgi2.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/dists/gentoo/apache/working/fastcgi_ispcp.conf

    r907 r1082  
    2828        FastCgiWrapper On 
    2929        FastCgiIpcDir /var/lib/apache2/fastcgi 
    30         FastCgiConfig -minProcesses 1 -maxProcesses 10 -singleThreshold 100 
    31                       #-killInterval 300 \ 
    32                       #-autoUpdate \ 
    33                       #-idle-timeout 240 \ 
    34                       #-pass-header HTTP_AUTHORIZATION 
     30        FastCgiConfig -minProcesses 1 \ 
     31                  -maxProcesses 400 \ 
     32                  -maxClassProcesses 5 \ 
     33                  -multiThreshold 80 \ 
     34                  -killInterval 60 \ 
     35                  -startDelay 5 
     36                  # -singleThreshold 100 \ 
     37                  # -autoUpdate \ 
     38                  # -pass-header HTTP_AUTHORIZATION 
    3539 
    36         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     40        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID}  -idle-timeout 300 
    3741 
    3842        # 
    …… 
    4347 
    4448        <Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter> 
    45             SetHandler fastcgi-script 
    46             Options +ExecCGI 
     49               SetHandler fastcgi-script 
     50               Options +ExecCGI 
    4751        </Location> 
    4852 

  • trunk/configs/dists/openbsd/apache/fastcgi.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/dists/opensuse/apache/fastcgi.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/dists/redhat/apache/fastcgi.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/dists/redhat/apache/fastcgi2.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/dists/ubuntu/apache/fastcgi.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/dists/ubuntu/apache/fastcgi2.conf

    r1059 r1082  
    2727                      -multiThreshold 80 \ 
    2828                      -killInterval 60 \ 
    29                       -startDelay 5 \ 
    30                       -idle-timeout 300 
     29                      -startDelay 5 
    3130                      # -singleThreshold 100 \ 
    3231                      # -autoUpdate \ 
    3332                      # -pass-header HTTP_AUTHORIZATION 
    3433 
    35         FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     34        FastCgiServer {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} -idle-timeout 300 
    3635 
    3736        # 

  • trunk/configs/postfix/main.cf

    r1047 r1082  
    7979smtpd_sasl_auth_enable       = yes 
    8080smtpd_sasl2_auth_enable      = yes 
    81 smtpd_sasl_security_options  = noanonymous, noplaintext 
     81smtpd_sasl_security_options  = noanonymous 
    8282smtpd_sasl_local_domain      = 
    8383broken_sasl_auth_clients     = yes 

  • trunk/docs/CentOS/INSTALL

    r1044 r1082  
    52524) Installation 
    5353--------------- 
    54 Make sure you are logged in as root. 
     54Make sure you are logged in as root and MySQL is running. 
    5555 
    56561.      Untar or unzip the distribution files to a secure directory: 
    …… 
    1501505) Update 
    151151--------- 
    152 Make sure you are logged in as root. 
     152Make sure you are logged in as root and MySQL is running. 
    153153 
    1541541. Untar or unzip the distribution files to a secure directory: 

  • trunk/docs/Debian/INSTALL

    r1050 r1082  
    53534) Installation 
    5454--------------- 
    55 Make sure you are logged in as root. 
     55Make sure you are logged in as root and MySQL is running. 
    5656 
    57571. Untar or unzip the distribution files to a secure directory: 
    …… 
    1291295) Update 
    130130--------- 
    131 Make sure you are logged in as root. 
     131Make sure you are logged in as root and MySQL is running. 
    132132 
    1331331. Untar or unzip the distribution files to a secure directory: 

  • trunk/docs/Fedora/INSTALL

    r1044 r1082  
    51514) Installation 
    5252--------------- 
    53 Make sure you are logged in as root. 
     53Make sure you are logged in as root and MySQL is running. 
    5454 
    55551. Untar or unzip the distribution files to a secure directory: 
    …… 
    1491495) Update 
    150150--------- 
    151 Make sure you are logged in as root. 
     151Make sure you are logged in as root and MySQL is running. 
    152152 
    1531531. Untar or unzip the distribution files to a secure directory: 

  • trunk/docs/FreeBSD/INSTALL

    r1050 r1082  
    54544) Installation 
    5555--------------- 
    56 Make sure you are logged in as root. 
     56Make sure you are logged in as root and MySQL is running. 
    5757 
    58581. Untar or unzip the distribution files to a secure directory: 
    …… 
    97975) Update 
    9898--------- 
    99 Make sure you are logged in as root. 
     99Make sure you are logged in as root and MySQL is running. 
    100100 
    1011011. Untar or unzip the distribution files to a secure directory: 

  • trunk/docs/Gentoo/INSTALL

    r1044 r1082  
    51514) Installation 
    5252--------------- 
    53 Make sure you are logged in as root. 
     53Make sure you are logged in as root and MySQL is running. 
    5454 
    55551. Untar or unzip the distribution files to a secure directory: 
    …… 
    1021025) Update 
    103103--------- 
    104 Make sure you are logged in as root. 
     104Make sure you are logged in as root and MySQL is running. 
    105105 
    1061061. Untar or unzip the distribution files to a secure directory: 

  • trunk/docs/OpenBSD/INSTALL

    r1044 r1082  
    52524) Installation 
    5353--------------- 
    54 Make sure you are logged in as root. 
     54Make sure you are logged in as root and MySQL is running. 
    5555 
    56561. Untar or unzip the distribution files to a secure directory: 
    …… 
    1741745) Update 
    175175--------- 
    176 Make sure you are logged in as root. 
     176Make sure you are logged in as root and MySQL is running. 
    177177 
    1781781. Untar or unzip the distribution files to a secure directory: 

  • trunk/docs/OpenSuse/INSTALL

    r1049 r1082  
    72724) Installation 
    7373--------------- 
    74 Make sure you are logged in as root. 
     74Make sure you are logged in as root and MySQL is running. 
    7575 
    76761. Untar or unzip the distribution files to a secure directory: 
    …… 
    1431435) Update 
    144144--------- 
    145 Make sure you are logged in as root. 
     145Make sure you are logged in as root and MySQL is running. 
    146146 
    1471471. Untar or unzip the distribution files to a secure directory: 

  • trunk/docs/RedHat/INSTALL

    r1044 r1082  
    54544) Installation 
    5555--------------- 
    56 Make sure you are logged in as root. 
     56Make sure you are logged in as root and MySQL is running. 
    5757 
    58581. Untar or unzip the distribution files to a secure directory: 
    …… 
    1031035) Update 
    104104--------- 
    105 Make sure you are logged in as root. 
     105Make sure you are logged in as root and MySQL is running. 
    106106 
    1071071. Untar or unzip the distribution files to a secure directory: 

  • trunk/docs/Ubuntu/INSTALL

    r1044 r1082  
    53534) Installation 
    5454--------------- 
    55 Make sure you are logged in as root. 
     55Make sure you are logged in as root and MySQL is running. 
    5656 
    57571. Untar or unzip the distribution files to a secure directory: 
    …… 
    1181185) Update 
    119119--------- 
    120 Make sure you are logged in as root. 
     120Make sure you are logged in as root and MySQL is running. 
    121121 
    1221221. Untar or unzip the distribution files to a secure directory: 

  • trunk/engine/backup/ispcp-backup-all

    r1013 r1082  
    44# Copyright (c) 2001-2006 by moleSoftware GmbH 
    55# http://www.molesoftware.com 
    6 # Copyright (c) 2006-2007 by isp Control Panel 
     6# Copyright (c) 2006-2008 by isp Control Panel 
    77# http://isp-control.net 
    88# 
    …… 
    288288                my $dmn_backup_dir = $main::cfg{'APACHE_WWW_DIR'}."/$dmn_name/backups"; 
    289289 
     290                # 
     291                # User Database Backup 
     292                # 
     293 
     294                if (! -d $dmn_backup_dir) { 
     295                        $rs = make_dir($dmn_backup_dir, $domain_uid, $domain_gid, 0770); 
     296 
     297                        return $rs if ($rs != 0); 
     298                } 
     299 
    290300                if ($zip eq "bzip2") { 
    291301                        $backup_filename = "$dmn_name-backup-$date.tar.bz2"; 
    …… 
    302312 
    303313                        return 1; 
    304                 } 
    305  
    306                 # 
    307                 # User Database Backup 
    308                 # 
    309  
    310                 if (! -d $dmn_backup_dir) { 
    311                         $rs = make_dir($dmn_backup_dir, $domain_uid, $domain_gid, 0770); 
    312  
    313                         return $rs if ($rs != 0); 
    314314                } 
    315315 

  • trunk/engine/setup/ispcp-update

    r1072 r1082  
    5050        RC2             => 3, 
    5151        RC3             => 4, 
     52        RC4             => 5, 
    5253        }; 
    5354 
    …… 
    131132\t(3) ispCP OMEGA 1.0.0 RC2 (incl. b and c) 
    132133\t(4) ispCP OMEGA 1.0.0 RC3 
     134\t(5) ispCP OMEGA 1.0.0 RC4 
    133135\t(0) abort 
    134136MSG 
    …… 
    140142        chop($rdata); 
    141143 
    142         while ($rdata < 0 || $rdata > 4) { 
     144        while ($rdata < 0 || $rdata > 5) { 
    143145                print STDOUT "\tPlease select an item mentioned above: "; 
    144146                $rdata = readline(\*STDIN); 
    …… 
    779781} 
    780782 
     783sub patch_ispcp_rc4() { 
     784        push_el(\@main::el, 'patch_ispcp_rc4()', 'Starting...'); 
     785 
     786    print STDOUT "\tNothing to do."; 
     787 
     788        push_el(\@main::el, 'patch_ispcp_rc4()', 'Ending...'); 
     789        return 0; 
     790} 
     791 
    781792sub prepare_update { 
    782793        my ($rs, $rdata) = (undef, undef); 
    …… 
    820831                } 
    821832        } 
    822         # ispCP 1.0.0 RC2/3 Update 
    823         elsif ($main::ua{'update'} >= RC2) { 
     833        # ispCP 1.0.0 RC2/3/4 Update 
     834        elsif ($main::ua{'update'} >= RC3) { 
    824835                stop_services("/tmp/vhcs2-backup-all.lock"); 
    825836 
    …… 
    846857                                $rs = patch_ispcp_rc3(); 
    847858                        } 
     859                        if ($rs == 0) { 
     860                                $rs = patch_ispcp_rc4(); 
     861                        } 
    848862                } 
    849863                # ispCP 1.0.0 RC3 
    850864                elsif ($main::ua{'update'} eq RC3) { 
    851865                        $rs = patch_ispcp_rc3(); 
     866                        if ($rs == 0) { 
     867                                $rs = patch_ispcp_rc4(); 
     868                        } 
     869                } 
     870                # ispCP 1.0.0 RC4 
     871                elsif ($main::ua{'update'} eq RC4) { 
     872                        $rs = patch_ispcp_rc4(); 
    852873                } 
    853874