Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 653

Show
Ignore:
Timestamp:
06/16/07 09:43:37 (1 year ago)
Author:
raphael
Message:

Added PHP_VERSION which acts as 4/5 switch
Fixed #323: main.cf and master.cf are installed before the backups are made
Removed hard-coded ftp-shell and phptmp dir
Fixed #389: ftp users can't be edited
Fixed #401: account with ftp accounts disabled can't be created
Fixed #293: account with mail accounts disabled can't be created
Custom logo is now deleted (not only removed from database)
Fixed #274: PHP4/5 switch added
Removed hard-coded phptmp dir being set on PMA's config.inc.php
Uninstaller now restores the resolver
Fixed #398: error in Ubuntu list of packages to install

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r652 r653  
    2020                * Added detection of lenny/sid and not just etch 
    2121                * Fixed #390: Extra character in fedora's languages.sql 
    22                 * Rewritten init.d/ispcp_network by adding start|stop|restart|force-restart targets,  
     22                * Rewritten init.d/ispcp_network by adding start|stop|restart|force-restart targets, 
    2323                        configurable via /etc/default/ispcp_network and added patch from #257 
     24                * Added PHP_VERSION which acts as 4/5 switch 
     25                * Fixed #323: main.cf and master.cf are installed before the backups are made 
    2426        - GUI: 
    2527                * Removed extra empty new line at the top of reseller/domain_statistics.php 
     28                * Removed hard-coded ftp-shell and phptmp dir 
     29                * Fixed #389: ftp users can't be edited 
     30                * Fixed #401: account with ftp accounts disabled can't be created 
     31                * Fixed #293: account with mail accounts disabled can't be created 
     32                * Custom logo is now deleted (not only removed from database) 
     33        - SETUP: 
     34                * Fixed #274: PHP4/5 switch added 
     35                * Removed hard-coded phptmp dir being set on PMA's config.inc.php 
     36                * Uninstaller now restores the resolver 
     37        - DOCS 
     38                * Fixed #398: error in Ubuntu list of packages to install 
    2639 
    27402007-06-13 Benedikt Heintel 

  • trunk/configs/apache/00_master.conf

    r555 r653  
    4141    <IfModule mod_fastcgi.c> 
    4242        ScriptAlias /php4/ {PHP_STARTER_DIR}/master/ 
     43        ScriptAlias /php5/ {PHP_STARTER_DIR}/master/ 
    4344        <Directory "{PHP_STARTER_DIR}/master"> 
    4445            AllowOverride None 
    …… 
    5556        </Directory> 
    5657    </IfModule> 
     58    <IfModule mod_php5.c> 
     59        <Directory {ROOT_DIR}/gui> 
     60            php_admin_value open_basedir "{ROOT_DIR}/gui/:/etc/ispcp/:/proc/:/var/www/virtual/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" 
     61            php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/" 
     62        </Directory> 
     63    </IfModule> 
    5764 
    5865</VirtualHost> 

  • trunk/configs/apache/fastcgi.conf

    r473 r653  
    3535              #-pass-header HTTP_AUTHORIZATION 
    3636 
    37 FastCgiServer {PHP_STARTER_DIR}/master/php4-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     37FastCgiServer {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} 
    3838 
    3939# 
    40 # PHP4 SUPPORT 
     40# PHP{PHP_VERSION} SUPPORT 
    4141# 
    4242 
    43 AddHandler php-fastcgi .php 
     43AddHandler php-fastcgi .php .php{PHP_VERSION} 
    4444 
    45 <Location /php4/php4-fcgi-starter> 
     45<Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter> 
    4646    SetHandler fastcgi-script 
    4747    Options +ExecCGI 
    4848</Location> 
    4949 
    50 Action php-fastcgi /php4/php4-fcgi-starter 
    51 AddType application/x-httpd-php .php 
    52  
    53 # 
    54 # PHP5 SUPPORT 
    55 # 
    56  
    57 #AddHandler php5-fastcgi .php5 
    58  
    59 #<Location /php5/php5-fcgi-starter> 
    60 #    SetHandler fastcgi-script 
    61 #    Options +ExecCGI 
    62 #</Location> 
    63  
    64 #Action php5-fastcgi /php5/php5-fcgi-starter 
    65 </IfModule> 
     50Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter 
     51AddType application/x-httpd-php .php .php{PHP_VERSION} 

  • trunk/configs/apache/fastcgi2.conf

    r473 r653  
    3535              #-pass-header HTTP_AUTHORIZATION 
    3636 
    37 FastCgiServer {PHP_STARTER_DIR}/master/php4-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     37FastCgiServer {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} 
    3838 
    3939# 
    40 # PHP4 SUPPORT 
     40# PHP{PHP_VERSION} SUPPORT 
    4141# 
    4242 
    43 AddHandler php-fastcgi .php 
     43AddHandler php-fastcgi .php .php{PHP_VERSION} 
    4444 
    45 <Location /php4/php4-fcgi-starter> 
     45<Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter> 
    4646    SetHandler fastcgi-script 
    4747    Options +ExecCGI 
    4848</Location> 
    4949 
    50 Action php-fastcgi /php4/php4-fcgi-starter 
    51 AddType application/x-httpd-php .php 
    52  
    53 # 
    54 # PHP5 SUPPORT 
    55 # 
    56  
    57 #AddHandler php5-fastcgi .php5 
    58  
    59 #<Location /php5/php5-fcgi-starter> 
    60 #    SetHandler fastcgi-script 
    61 #    Options +ExecCGI 
    62 #</Location> 
    63  
    64 #Action php5-fastcgi /php5/php5-fcgi-starter 
    65 </IfModule> 
     50Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter 
     51AddType application/x-httpd-php .php .php{PHP_VERSION} 

  • trunk/configs/apache/parts/als_php2_entry.tpl

    r606 r653  
    1313    <IfModule mod_fastcgi.c> 
    1414        ScriptAlias /php4/ {STARTER_DIR}/{DMN_NAME}/ 
     15        ScriptAlias /php5/ {STARTER_DIR}/{DMN_NAME}/ 
    1516        <Directory "{STARTER_DIR}/{DMN_NAME}"> 
    1617            AllowOverride None 

  • trunk/configs/apache/parts/dmn_php2_entry.tpl

    r606 r653  
    1313    <IfModule mod_fastcgi.c> 
    1414        ScriptAlias /php4/ {STARTER_DIR}/{DMN_NAME}/ 
     15        ScriptAlias /php5/ {STARTER_DIR}/{DMN_NAME}/ 
    1516        <Directory "{STARTER_DIR}/{DMN_NAME}"> 
    1617            AllowOverride None 

  • trunk/configs/apache/parts/ispcp_base.tpl

    r473 r653  
    3131<Directory /var/www/ispcp/gui/tools/filemanager> 
    3232    <IfModule mod_php4.c> 
     33        php_flag register_globals On 
     34        php_admin_value open_basedir "/var/www/ispcp/gui/tools/filemanager/:/tmp/:/usr/share/php/" 
     35    </IfModule> 
     36    <IfModule mod_php5.c> 
    3337        php_flag register_globals On 
    3438        php_admin_value open_basedir "/var/www/ispcp/gui/tools/filemanager/:/tmp/:/usr/share/php/" 

  • trunk/configs/apache/parts/sub_php2_entry.tpl

    r606 r653  
    1313    <IfModule mod_fastcgi.c> 
    1414        ScriptAlias /php4/ {STARTER_DIR}/{DMN_NAME}/ 
     15        ScriptAlias /php5/ {STARTER_DIR}/{DMN_NAME}/ 
    1516        <Directory "{STARTER_DIR}/{DMN_NAME}"> 
    1617            AllowOverride None 

  • trunk/configs/apache/working/ispcp.conf

    r473 r653  
    3131<Directory /var/www/ispcp/gui/tools/filemanager> 
    3232    <IfModule mod_php4.c> 
     33        php_flag register_globals On 
     34        php_admin_value open_basedir "/var/www/ispcp/gui/tools/filemanager/:/tmp/:/usr/share/php/" 
     35    </IfModule> 
     36    <IfModule mod_php5.c> 
    3337        php_flag register_globals On 
    3438        php_admin_value open_basedir "/var/www/ispcp/gui/tools/filemanager/:/tmp/:/usr/share/php/" 

  • trunk/configs/dists/fedora/postfix/Makefile

    r473 r653  
    2424         
    2525        cp -R ./ispcp $(ROOT_POSTFIX_CONF) 
    26       cp ./main.cf $(ROOT_POSTFIX_CONF) 
    27       cp ./master.cf $(ROOT_POSTFIX_CONF) 
     26#     cp ./main.cf $(ROOT_POSTFIX_CONF) 
     27#     cp ./master.cf $(ROOT_POSTFIX_CONF) 
    2828 
    2929uninstall: 

  • trunk/configs/dists/freebsd/apache/00_master.conf

    r555 r653  
    4141    <IfModule mod_fastcgi.c> 
    4242        ScriptAlias /php4/ {PHP_STARTER_DIR}/master/ 
     43        ScriptAlias /php5/ {PHP_STARTER_DIR}/master/ 
    4344        <Directory "{PHP_STARTER_DIR}/master"> 
    4445            AllowOverride None 
    …… 
    5556        </Directory> 
    5657    </IfModule> 
     58    <IfModule mod_php5.c> 
     59        <Directory {ROOT_DIR}/gui> 
     60            php_admin_value open_basedir "{ROOT_DIR}/gui/:/etc/ispcp/:/proc/:/var/www/virtual/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" 
     61            php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/" 
     62        </Directory> 
     63    </IfModule> 
    5764 
    5865</VirtualHost> 

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

    r473 r653  
    3535              #-pass-header HTTP_AUTHORIZATION 
    3636 
    37 FastCgiServer {PHP_STARTER_DIR}/master/php4-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     37FastCgiServer {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} 
    3838 
    3939# 
    40 # PHP4 SUPPORT 
     40# PHP{PHP_VERSION} SUPPORT 
    4141# 
    4242 
    43 AddHandler php-fastcgi .php 
     43AddHandler php-fastcgi .php .php{PHP_VERSION} 
    4444 
    45 <Location /php4/php4-fcgi-starter> 
     45<Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter> 
    4646    SetHandler fastcgi-script 
    4747    Options +ExecCGI 
    4848</Location> 
    4949 
    50 Action php-fastcgi /php4/php4-fcgi-starter 
    51 AddType application/x-httpd-php .php 
    52  
    53 # 
    54 # PHP5 SUPPORT 
    55 # 
    56  
    57 #AddHandler php5-fastcgi .php5 
    58  
    59 #<Location /php5/php5-fcgi-starter> 
    60 #    SetHandler fastcgi-script 
    61 #    Options +ExecCGI 
    62 #</Location> 
    63  
    64 #Action php5-fastcgi /php5/php5-fcgi-starter 
    65 </IfModule> 
     50Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter 
     51AddType application/x-httpd-php .php .php{PHP_VERSION} 

  • trunk/configs/dists/freebsd/ispcp.conf

    r598 r653  
     1# 
     2# ispCP ω (OMEGA) a Virtual Hosting Control Panel 
     3# Copyright (c) 2006-2007 by isp Control Panel 
     4# http://isp-control.net 
     5# 
    16 
    27# 
    …… 
    7580 
    7681PHP5_FASTCGI_BIN = /usr/bin/php5-cgi 
     82 
     83PHP_VERSION = 4 
    7784 
    7885# 
    …… 
    180187MTA_MAILBOX_GID_NAME = _postfix 
    181188 
    182 MTA_SASLDB_LOCAL_DOMAIN = ispcp.net 
     189MTA_SASLDB_LOCAL_DOMAIN = isp-control.net 
    183190 
    184191MTA_SASLDB_FILE = /var/spool/postfix/etc/sasldb2 
    …… 
    321328ISPCP_SUPPORT_SYSTEM_TARGET = 
    322329 
    323 MYSQL_PREFIX = yes 
    324  
    325 # '' for MYSQL_PREFIX = yes, infront or behind for MYSQL_PREFIX = no 
     330MYSQL_PREFIX = no 
     331 
     332# '' for MYSQL_PREFIX = no, 
     333# 'infront' or 'behind' for MYSQL_PREFIX = yes 
    326334MYSQL_PREFIX_TYPE = 
    327335 
    …… 
    341349 
    342350# 
    343 # htaccess management (21.04.2005). 
     351# htaccess management 
    344352# 
    345353 
    …… 
    351359 
    352360# 
    353 # backup management (16.05.2005). 
     361# backup management 
    354362# 
    355363 

  • trunk/configs/dists/freebsd/postfix/BSDmakefile

    r473 r653  
    2020        cp -R ./ispcp $(SYSTEM_CONF)/postfix 
    2121        cp -R ./ispcp $(ROOT_POSTFIX_CONF) 
    22       cp ./main.cf $(ROOT_POSTFIX_CONF) 
    23       cp ./master.cf $(ROOT_POSTFIX_CONF) 
     22#     cp ./main.cf $(ROOT_POSTFIX_CONF) 
     23#     cp ./master.cf $(ROOT_POSTFIX_CONF) 
    2424        cp ./postfix.rc $(ROOT_CONF)/postfix.rc 
    2525        chmod 700 $(ROOT_CONF)/postfix.rc 

  • trunk/configs/dists/gentoo/apache/00_master.conf

    r555 r653  
    4141    <IfModule mod_fastcgi.c> 
    4242        ScriptAlias /php4/ {PHP_STARTER_DIR}/master/ 
     43        ScriptAlias /php5/ {PHP_STARTER_DIR}/master/ 
    4344        <Directory "{PHP_STARTER_DIR}/master"> 
    4445            AllowOverride None 
    …… 
    5556        </Directory> 
    5657    </IfModule> 
     58    <IfModule mod_php5.c> 
     59        <Directory {ROOT_DIR}/gui> 
     60            php_admin_value open_basedir "{ROOT_DIR}/gui/:/etc/ispcp/:/proc/:/var/www/virtual/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" 
     61            php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/" 
     62        </Directory> 
     63    </IfModule> 
    5764 
    5865</VirtualHost> 

  • trunk/configs/dists/gentoo/apache/parts/als_php2_entry.tpl

    r432 r653  
    55        php_admin_value sendmail_path '/usr/sbin/sendmail -f {SUEXEC_USER} -t -i' 
    66    </IfModule> 
     7    <IfModule mod_php5.c> 
     8        php_admin_value open_basedir "{WWW_DIR}/{DMN_NAME}{MOUNT_POINT}:{WWW_DIR}/{DMN_NAME}{MOUNT_POINT}/phptmp:{PEAR_DIR}" 
     9        php_admin_value upload_tmp_dir "{WWW_DIR}/{DMN_NAME}{MOUNT_POINT}/phptmp" 
     10        php_admin_value session.save_path "{WWW_DIR}/{DMN_NAME}{MOUNT_POINT}/phptmp" 
     11        php_admin_value sendmail_path '/usr/sbin/sendmail -f {SUEXEC_USER} -t -i' 
     12    </IfModule> 
     13    <IfModule mod_fastcgi.c> 
     14        ScriptAlias /php4/ {STARTER_DIR}/{DMN_NAME}/ 
     15        ScriptAlias /php5/ {STARTER_DIR}/{DMN_NAME}/ 
     16        <Directory "{STARTER_DIR}/{DMN_NAME}"> 
     17            AllowOverride None 
     18            Options +ExecCGI -MultiViews -Indexes 
     19            Order allow,deny 
     20            Allow from all 
     21        </Directory> 
     22    </IfModule> 

  • trunk/configs/dists/gentoo/apache/parts/dmn_php2_entry.tpl

    r432 r653  
    55        php_admin_value sendmail_path '/usr/sbin/sendmail -f {SUEXEC_USER} -t -i' 
    66    </IfModule> 
     7    <IfModule mod_php5.c> 
     8        php_admin_value open_basedir "{WWW_DIR}/{DMN_NAME}:{WWW_DIR}/{DMN_NAME}/phptmp:{PEAR_DIR}" 
     9        php_admin_value upload_tmp_dir "{WWW_DIR}/{DMN_NAME}/phptmp" 
     10        php_admin_value session.save_path "{WWW_DIR}/{DMN_NAME}/phptmp" 
     11        php_admin_value sendmail_path '/usr/sbin/sendmail -f {SUEXEC_USER} -t -i' 
     12    </IfModule> 
     13    <IfModule mod_fastcgi.c> 
     14        ScriptAlias /php4/ {STARTER_DIR}/{DMN_NAME}/ 
     15        ScriptAlias /php5/ {STARTER_DIR}/{DMN_NAME}/ 
     16        <Directory "{STARTER_DIR}/{DMN_NAME}"> 
     17            AllowOverride None 
     18            Options +ExecCGI -MultiViews -Indexes 
     19            Order allow,deny 
     20            Allow from all 
     21        </Directory> 
     22    </IfModule> 

  • trunk/configs/dists/gentoo/apache/parts/ispcp_base.tpl

    r473 r653  
    3131<Directory /var/www/ispcp/gui/tools/filemanager> 
    3232    <IfModule mod_php4.c> 
     33        php_flag register_globals On 
     34        php_admin_value open_basedir "/var/www/ispcp/gui/tools/filemanager/:/tmp/:/usr/share/php/" 
     35    </IfModule> 
     36    <IfModule mod_php5.c> 
    3337        php_flag register_globals On 
    3438        php_admin_value open_basedir "/var/www/ispcp/gui/tools/filemanager/:/tmp/:/usr/share/php/" 

  • trunk/configs/dists/gentoo/apache/parts/sub_php2_entry.tpl

    r432 r653  
    55        php_admin_value sendmail_path '/usr/sbin/sendmail -f {SUEXEC_USER} -t -i' 
    66    </IfModule> 
     7    <IfModule mod_php5.c> 
     8        php_admin_value open_basedir "{WWW_DIR}/{SUB_NAME_PHP2}:{WWW_DIR}/{SUB_NAME_PHP2}/phptmp:{PEAR_DIR}" 
     9        php_admin_value upload_tmp_dir "{WWW_DIR}/{SUB_NAME_PHP2}/phptmp" 
     10        php_admin_value session.save_path "{WWW_DIR}/{SUB_NAME_PHP2}/phptmp" 
     11        php_admin_value sendmail_path '/usr/sbin/sendmail -f {SUEXEC_USER} -t -i' 
     12    </IfModule> 
     13    <IfModule mod_fastcgi.c> 
     14        ScriptAlias /php4/ {STARTER_DIR}/{DMN_NAME}/ 
     15        ScriptAlias /php5/ {STARTER_DIR}/{DMN_NAME}/ 
     16        <Directory "{STARTER_DIR}/{DMN_NAME}"> 
     17            AllowOverride None 
     18            Options +ExecCGI -MultiViews -Indexes 
     19            Order allow,deny 
     20            Allow from all 
     21        </Directory> 
     22    </IfModule> 

  • trunk/configs/dists/gentoo/postfix/Makefile

    r473 r653  
    2424         
    2525        cp -R ./ispcp $(ROOT_POSTFIX_CONF) 
    26       cp ./main.cf $(ROOT_POSTFIX_CONF) 
    27       cp ./master.cf $(ROOT_POSTFIX_CONF) 
     26#     cp ./main.cf $(ROOT_POSTFIX_CONF) 
     27#     cp ./master.cf $(ROOT_POSTFIX_CONF) 
    2828 
    2929uninstall: 

  • trunk/configs/dists/openbsd/apache/00_master.conf

    r555 r653  
    4141    <IfModule mod_fastcgi.c> 
    4242        ScriptAlias /php4/ {PHP_STARTER_DIR}/master/ 
     43        ScriptAlias /php5/ {PHP_STARTER_DIR}/master/ 
    4344        <Directory "{PHP_STARTER_DIR}/master"> 
    4445            AllowOverride None 
    …… 
    5556        </Directory> 
    5657    </IfModule> 
     58    <IfModule mod_php5.c> 
     59        <Directory {ROOT_DIR}/gui> 
     60            php_admin_value open_basedir "{ROOT_DIR}/gui/:/etc/ispcp/:/proc/:/var/www/virtual/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" 
     61            php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/" 
     62        </Directory> 
     63    </IfModule> 
    5764 
    5865</VirtualHost> 

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

    r473 r653  
    3535              #-pass-header HTTP_AUTHORIZATION 
    3636 
    37 FastCgiServer {PHP_STARTER_DIR}/master/php4-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     37FastCgiServer {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} 
    3838 
    3939# 
    40 # PHP4 SUPPORT 
     40# PHP{PHP_VERSION} SUPPORT 
    4141# 
    4242 
    43 AddHandler php-fastcgi .php 
     43AddHandler php-fastcgi .php .php{PHP_VERSION} 
    4444 
    45 <Location /php4/php4-fcgi-starter> 
     45<Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter> 
    4646    SetHandler fastcgi-script 
    4747    Options +ExecCGI 
    4848</Location> 
    4949 
    50 Action php-fastcgi /php4/php4-fcgi-starter 
    51 AddType application/x-httpd-php .php 
    52  
    53 # 
    54 # PHP5 SUPPORT 
    55 # 
    56  
    57 #AddHandler php5-fastcgi .php5 
    58  
    59 #<Location /php5/php5-fcgi-starter> 
    60 #    SetHandler fastcgi-script 
    61 #    Options +ExecCGI 
    62 #</Location> 
    63  
    64 #Action php5-fastcgi /php5/php5-fcgi-starter 
    65 </IfModule> 
     50Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter 
     51AddType application/x-httpd-php .php .php{PHP_VERSION} 

  • trunk/configs/dists/openbsd/ispcp.conf

    r577 r653  
     1# 
     2# ispCP ω (OMEGA) a Virtual Hosting Control Panel 
     3# Copyright (c) 2006-2007 by isp Control Panel 
     4# http://isp-control.net 
     5# 
    16 
    27# 
    …… 
    6974 
    7075# 
    71 # PHP FastCgi BIN 
     76# PHP FastCGI data 
    7277# 
    7378 
    …… 
    7580 
    7681PHP5_FASTCGI_BIN = /usr/bin/php5-cgi 
     82 
     83PHP_VERSION = 4 
    7784 
    7885# 
    …… 
    180187MTA_MAILBOX_GID_NAME = _postfix 
    181188 
    182 MTA_SASLDB_LOCAL_DOMAIN = ispcp.net 
     189MTA_SASLDB_LOCAL_DOMAIN = isp-control.net 
    183190 
    184191MTA_SASLDB_FILE = /var/spool/postfix/etc/sasldb2 
    …… 
    321328ISPCP_SUPPORT_SYSTEM_TARGET = 
    322329 
    323 MYSQL_PREFIX = yes 
    324  
    325 # '' for MYSQL_PREFIX = yes, infront or behind for MYSQL_PREFIX = no 
     330MYSQL_PREFIX = no 
     331 
     332# '' for MYSQL_PREFIX = no, 
     333# 'infront' or 'behind' for MYSQL_PREFIX = yes 
    326334MYSQL_PREFIX_TYPE = 
    327335 
    …… 
    341349 
    342350# 
    343 # htaccess management (21.04.2005). 
     351# htaccess management 
    344352# 
    345353 
    …… 
    351359 
    352360# 
    353 # backup management (16.05.2005). 
     361# backup management 
    354362# 
    355363 

  • trunk/configs/dists/openbsd/postfix/BSDmakefile

    r473 r653  
    2020        cp -R ./ispcp $(SYSTEM_CONF)/postfix 
    2121        cp -R ./ispcp $(ROOT_POSTFIX_CONF) 
    22       cp ./main.cf $(ROOT_POSTFIX_CONF) 
    23       cp ./master.cf $(ROOT_POSTFIX_CONF) 
     22#     cp ./main.cf $(ROOT_POSTFIX_CONF) 
     23#     cp ./master.cf $(ROOT_POSTFIX_CONF) 
    2424        cp ./postfix.rc $(ROOT_CONF)/postfix.rc 
    2525        chmod 700 $(ROOT_CONF)/postfix.rc 

  • trunk/configs/dists/redhat/apache/00_master.conf

    r555 r653  
    4141    <IfModule mod_fastcgi.c> 
    4242        ScriptAlias /php4/ {PHP_STARTER_DIR}/master/ 
     43        ScriptAlias /php5/ {PHP_STARTER_DIR}/master/ 
    4344        <Directory "{PHP_STARTER_DIR}/master"> 
    4445            AllowOverride None 
    …… 
    5556        </Directory> 
    5657    </IfModule> 
     58    <IfModule mod_php5.c> 
     59        <Directory {ROOT_DIR}/gui> 
     60            php_admin_value open_basedir "{ROOT_DIR}/gui/:/etc/ispcp/:/proc/:/var/www/virtual/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" 
     61            php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/" 
     62        </Directory> 
     63    </IfModule> 
    5764 
    5865</VirtualHost> 

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

    r473 r653  
    1 # ISPCP ω (OMEGA) - Virtual Hosting Control System | Omega Version 
     1# ISPCP ω (OMEGA) - Virtual Hosting Control System | Omega Version 
    22# Copyright (c) 2006-2007 by ispCP | http://isp-control.net 
    33# 
    …… 
    3535              #-pass-header HTTP_AUTHORIZATION 
    3636 
    37 FastCgiServer {PHP_STARTER_DIR}/master/php4-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     37FastCgiServer {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} 
    3838 
    3939# 
    40 # PHP4 SUPPORT 
     40# PHP{PHP_VERSION} SUPPORT 
    4141# 
    4242 
    43 AddHandler php-fastcgi .php 
     43AddHandler php-fastcgi .php .php{PHP_VERSION} 
    4444 
    45 <Location /php4/php4-fcgi-starter> 
     45<Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter> 
    4646    SetHandler fastcgi-script 
    4747    Options +ExecCGI 
    4848</Location> 
    4949 
    50 Action php-fastcgi /php4/php4-fcgi-starter 
    51 AddType application/x-httpd-php .php 
    52  
    53 # 
    54 # PHP5 SUPPORT 
    55 # 
    56  
    57 #AddHandler php5-fastcgi .php5 
    58  
    59 #<Location /php5/php5-fcgi-starter> 
    60 #    SetHandler fastcgi-script 
    61 #    Options +ExecCGI 
    62 #</Location> 
    63  
    64 #Action php5-fastcgi /php5/php5-fcgi-starter 
    65 </IfModule> 
     50Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter 
     51AddType application/x-httpd-php .php .php{PHP_VERSION} 

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

    r473 r653  
    1 # ISPCP ω (OMEGA) - Virtual Hosting Control System | Omega Version 
     1# ISPCP ω (OMEGA) - Virtual Hosting Control System | Omega Version 
    22# Copyright (c) 2006-2007 by ispCP | http://isp-control.net 
    33# 
    …… 
    3535              #-pass-header HTTP_AUTHORIZATION 
    3636 
    37 FastCgiServer {PHP_STARTER_DIR}/master/php4-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID} 
     37FastCgiServer {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} 
    3838 
    3939# 
    40 # PHP4 SUPPORT 
     40# PHP{PHP_VERSION} SUPPORT 
    4141# 
    4242 
    43 AddHandler php-fastcgi .php 
     43AddHandler php-fastcgi .php .php{PHP_VERSION} 
    4444 
    45 <Location /php4/php4-fcgi-starter> 
     45<Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter> 
    4646    SetHandler fastcgi-script 
    4747    Options +ExecCGI 
    4848</Location> 
    4949 
    50 Action php-fastcgi /php4/php4-fcgi-starter 
    51 AddType application/x-httpd-php .php 
    52  
    53 # 
    54 # PHP5 SUPPORT 
    55 # 
    56  
    57 #AddHandler php5-fastcgi .php5 
    58  
    59 #<Location /php5/php5-fcgi-starter> 
    60 #    SetHandler fastcgi-script 
    61 #    Options +ExecCGI 
    62 #</Location> 
    63  
    64 #Action php5-fastcgi /php5/php5-fcgi-starter 
    65 </IfModule> 
     50Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter 
     51AddType application/x-httpd-php .php .php{PHP_VERSION} 

  • trunk/configs/dists/redhat/postfix/Makefile

    r473 r653  
    2424         
    2525        cp -R ./ispcp $(ROOT_POSTFIX_CONF) 
    26       cp ./main.cf $(ROOT_POSTFIX_CONF) 
    27       cp ./master.cf $(ROOT_POSTFIX_CONF) 
     26#     cp ./main.cf $(ROOT_POSTFIX_CONF) 
     27#     cp ./master.cf $(ROOT_POSTFIX_CONF) 
    2828 
    2929uninstall: 

  • trunk/configs/dists/sles9/postfix/Makefile

    r473 r653  
    2424         
    2525        cp -R ./ispcp $(ROOT_POSTFIX_CONF) 
    26       cp ./main.cf $(ROOT_POSTFIX_CONF) 
    27       cp ./master.cf $(ROOT_POSTFIX_CONF) 
     26#     cp ./main.cf $(ROOT_POSTFIX_CONF) 
     27#     cp ./master.cf $(ROOT_POSTFIX_CONF) 
    2828 
    2929uninstall: 

  • trunk/configs/dists/suse100/postfix/Makefile

    r473 r653  
    2424         
    2525        cp -R ./ispcp $(ROOT_POSTFIX_CONF) 
    26       cp ./main.cf $(ROOT_POSTFIX_CONF) 
    27       cp ./master.cf $(ROOT_POSTFIX_CONF) 
     26#     cp ./main.cf $(ROOT_POSTFIX_CONF) 
     27#     cp ./master.cf $(ROOT_POSTFIX_CONF) 
    2828 
    2929uninstall: 

  • trunk/configs/dists/suse93/postfix/Makefile

    r473 r653  
    2424         
    2525        cp -R ./ispcp $(ROOT_POSTFIX_CONF) 
    26       cp ./main.cf $(ROOT_POSTFIX_CONF) 
    27       cp ./master.cf $(ROOT_POSTFIX_CONF) 
     26#     cp ./main.cf $(ROOT_POSTFIX_CONF) 
     27#     cp ./master.cf $(ROOT_POSTFIX_CONF) 
    2828 
    2929uninstall: 

  • trunk/configs/dists/ubuntu/apache/00_master.conf

    r555 r653  
    4141    <IfModule mod_fastcgi.c> 
    4242        ScriptAlias /php4/ {PHP_STARTER_DIR}/master/ 
     43        ScriptAlias /php5/ {PHP_STARTER_DIR}/master/ 
    4344        <Directory "{PHP_STARTER_DIR}/master"> 
    4445            AllowOverride None 
    …… 
    5556        </Directory> 
    5657    </IfModule> 
     58    <IfModule mod_php5.c> 
     59        <Directory {ROOT_DIR}/gui> 
     60            php_admin_value open_basedir "{ROOT_DIR}/gui/:/etc/ispcp/:/proc/:/var/www/virtual/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" 
     61            php_admin_value session.save_path "{ROOT_DIR}/gui/phptmp/" 
     62        </Directory> 
     63    </IfModule> 
    5764 
    5865</VirtualHost> 

  • trunk/configs/dists/ubuntu/apache/Makefile

    r509 r653  
    2727        cp -R ./working $(SYSTEM_CONF)/apache 
    2828 
    29         cp -R ./fastcgi.conf ${ROOT_APACHE_CONF}/mods-available/fastcgi.conf 
     29        cp -R ./working/fastcgi.conf ${ROOT_APACHE_CONF}/mods-available/fastcgi.conf 
    3030 
    3131uninstall: 

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