Changeset 683

Show
Ignore:
Timestamp:
07/02/07 01:23:15 (17 months ago)
Author:
rats
Message:

- CONFIGS:

  • Fixed #451: reload of apache after logrotate

- DISTS:

  • Dropped support for SuSE 9.3
  • Changed SuSE 10.0 to SuSE 10 to support all SuSE versions above 10
Location:
trunk
Files:
1 removed
12 modified
14 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/CHANGELOG

    r682 r683  
    1010|               * gui: disable stats-alias in client menu         | 
    1111\_________________________________________________________________/ 
     12 
     132007-07-01 Benedikt Heintel 
     14        - CONFIGS: 
     15                * Fixed #451: reload of apache after logrotate 
     16        - DISTS: 
     17                * Dropped support for SuSE 9.3 
     18                * Changed SuSE 10.0 to SuSE 10 to support all SuSE versions above 10 
    1219 
    13202007-07-01 Raphael Geissert 

  • trunk/configs/logrotate/ispcp

    r644 r683  
    1212        endscript 
    1313        postrotate 
    14         if [ -f /var/run/apache2.pid ]; then 
    15                 /etc/init.d/apache2 reload > /dev/null 
    16         fi 
     14        for i in `seq 1 10`; 
     15                if [ -f /var/run/apache2.pid ]; then 
     16                        /etc/init.d/apache2 stop > /dev/null 
     17                        sleep 5 
     18                        /etc/init.d/apache2 start > /dev/null 
     19                fi 
     20        done 
    1721        endscript 
    1822} 

  • trunk/docs/Fedora/INSTALL

    r524 r683  
    9292   These are the Variables you have to look at: 
    9393 
    94         AWSTATS_DIR = no                        # Either no or path to the awstats configs dir 
    9594        SECONDARY_DNS = 
    9695        MYSQL_PREFIX_TYPE =                     # '' for MYSQL_PREFIX = yes, 

  • trunk/docs/Gentoo/INSTALL

    r524 r683  
    8585   These are the Variables you have to look at: 
    8686 
    87         AWSTATS_DIR = no                        # Either no or path to the awstats configs dir 
    8887        SECONDARY_DNS = 
    8988        MYSQL_PREFIX_TYPE =                     # '' for MYSQL_PREFIX = yes, 

  • trunk/docs/RedHat/INSTALL

    r524 r683  
    8989   These are the Variables you have to look at: 
    9090 
    91         AWSTATS_DIR = no                        # Either no or path to the awstats configs dir 
    9291        SECONDARY_DNS = 
    9392        MYSQL_PREFIX_TYPE =                     # '' for MYSQL_PREFIX = yes, 

  • trunk/docs/SuSE/INSTALL

    r524 r683  
    8787   These are the Variables you have to look at: 
    8888 
    89         AWSTATS_DIR = no                        # Either no or path to the awstats configs dir 
    9089        SECONDARY_DNS = 
    9190        MYSQL_PREFIX_TYPE =                     # '' for MYSQL_PREFIX = yes, 

  • trunk/docs/Ubuntu/INSTALL

    r653 r683  
    9595   These are the Variables you have to look at: 
    9696 
    97         AWSTATS_DIR = no                        # Either no or path to the awstats configs dir 
    9897        SECONDARY_DNS = 
    9998        MYSQL_PREFIX_TYPE =                     # '' for MYSQL_PREFIX = yes, 

  • trunk/gui/imagecode.php

    r682 r683  
    11<?php 
    22/** 
    3  *  ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 *  ispCP (OMEGA) a Virtual Hosting Control System 
    44 * 
    5  *  @copyright  2001-2006 by moleSoftware GmbH 
    65 *  @copyright  2006-2007 by ispCP | http://isp-control.net 
    76 *  @link               http://isp-control.net 
    … …  
    98 * 
    109 *  @license 
    11  *  This program is free software; you can redistribute it and/or modify it under 
    12  *  the terms of the MPL General Public License as published by the Free Software 
    13  *  Foundation; either version 1.1 of the License, or (at your option) any later 
    14  *  version. 
    15  *  You should have received a copy of the MPL Mozilla Public License along with 
    16  *  this program; if not, write to the Open Source Initiative (OSI) 
    17  *  http://opensource.org | osi@opensource.org 
     10 *   This program is free software; you can redistribute it and/or 
     11 *   modify it under the terms of the GPL General Public License 
     12 *   as published by the Free Software Foundation; either version 2.0 
     13 *   of the License, or (at your option) any later version. 
     14 * 
     15 *   This program is distributed in the hope that it will be useful, 
     16 *   but WITHOUT ANY WARRANTY; without even the implied warranty of 
     17 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     18 *   GPL General Public License for more details. 
     19 * 
     20 *   You may have received a copy of the GPL General Public License 
     21 *   along with this program. 
     22 * 
     23 *   An on-line copy of the GPL General Public License can be found 
     24 *   http://www.fsf.org/licensing/licenses/gpl.txt 
    1825 **/ 
    19  
    2026 
    2127require 'include/ispcp-lib.php'; 

  • trunk/gui/reseller/ahp.php

    r682 r683  
    11<?php 
    22/** 
    3  *  ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 *  ispCP (OMEGA) a Virtual Hosting Control System 
    44 * 
    55 *  @copyright  2001-2006 by moleSoftware GmbH 
    … …  
    1717 *  http://opensource.org | osi@opensource.org 
    1818 **/ 
    19  
    2019 
    2120require '../include/ispcp-lib.php'; 

  • trunk/gui/reseller/ehp.php

    r682 r683  
    11<?php 
    22/** 
    3  *  ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 *  ispCP (OMEGA) a Virtual Hosting Control System 
    44 * 
    55 *  @copyright  2001-2006 by moleSoftware GmbH 
    … …  
    1717 *  http://opensource.org | osi@opensource.org 
    1818 **/ 
    19  
    20  
    2119 
    2220require '../include/ispcp-lib.php'; 
    … …  
    289287  } else if (!ispcp_limit_check($hp_mail, 99999)) { 
    290288    $ahp_error = tr('Incorrect mail account length or syntax!'); 
    291   } else if (!ispcp_limit_check($hp_ftp, 99999)) { 
     289  } else if (!ispcp_limit_check($hp_ftp, 99999) || $hp_ftp == -1) { 
    292290    $ahp_error = tr('Incorrect FTP account length or syntax!'); 
    293291  } else if (!ispcp_limit_check($hp_sql_user, 99999)) { 

  • trunk/gui/reseller/rau2.php

    r682 r683  
    11<?php 
    22/** 
    3  *  ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 *  ispCP (OMEGA) a Virtual Hosting Control System 
    44 * 
    55 *  @copyright  2001-2006 by moleSoftware GmbH 
    … …  
    1717 *  http://opensource.org | osi@opensource.org 
    1818 **/ 
    19  
    20  
    2119 
    2220require '../include/ispcp-lib.php'; 
    … …  
    254252                $hp_mail = clean_input($_POST['nreseller_max_mail_cnt']); 
    255253 
    256         if(isset($_POST['nreseller_max_ftp_cnt'])) 
     254        if(isset($_POST['nreseller_max_ftp_cnt']) || $hp_ftp == -1) 
    257255                $hp_ftp  = clean_input($_POST['nreseller_max_ftp_cnt']); 
    258256 

  • trunk/gui/reseller/rau3.php

    r679 r683  
    11<?php 
    22/** 
    3  *  ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 *  ispCP (OMEGA) a Virtual Hosting Control System 
    44 * 
    55 *  @copyright  2001-2006 by moleSoftware GmbH