Changeset 906

Show
Ignore:
Timestamp:
11/15/2007 05:14:31 PM (8 months ago)
Author:
pasichnyk
Message:

Updated gentoo configs to be in sync with the debian ones (added missing variables, etc). Specifically fixed the makefile and mod_fcgid compatibility for gentoo. INSTALL document and gentoo-packages have also been updated with some missing packages and steps to make installation more straight forward. I now have ispCP installing on gentoo and brining up a
working ispCP website, with no tweaking required. Able to add domains, emails, mailboxes, subdomains, etc. Still need to verify if ftp/mail needs changes to work correctly, and I will do that ASAP.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/Makefile.gentoo

    r873 r906  
    2323SYSTEM_FCGI=$(INST_PREF)/var/www/fcgi 
    2424 
     25SYSTEM_SCOREBOARDS=$(INST_PREF)/var/www/scoreboards 
     26 
    2527SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual 
    2628 
    2729SYSTEM_MAKE_DIRS=/bin/mkdir -p 
     30 
     31POSTFIX_SASLDB2_DIR=$(INST_PREF)/var/spool/postfix/etc 
    2832 
    2933export 
     
    3943        $(SYSTEM_MAKE_DIRS) $(SYSTEM_VIRTUAL) 
    4044        $(SYSTEM_MAKE_DIRS) $(SYSTEM_FCGI) 
     45        $(SYSTEM_MAKE_DIRS) $(SYSTEM_SCOREBOARDS) 
    4146        $(SYSTEM_MAKE_DIRS) $(SYSTEM_AWSTATS) 
    4247        $(SYSTEM_MAKE_DIRS) $(SYSTEM_MAIL_VIRTUAL) 
    4348        $(SYSTEM_MAKE_DIRS) $(SYSTEM_APACHE_BACK_LOG) 
     49        $(SYSTEM_MAKE_DIRS) $(POSTFIX_SASLDB2_DIR) 
    4450 
    4551        cd ./configs && $(MAKE) install 
     
    6167        rm -rf $(SYSTEM_VIRTUAL) 
    6268        rm -rf $(SYSTEM_FCGI) 
     69        rm -rf $(SYSTEM_SCOREBOARDS) 
    6370        rm -rf $(SYSTEM_MAIL_VIRTUAL) 
    6471        rm -rf $(SYSTEM_APACHE_BACK_LOG) 
     72        rm -rf $(POSTFIX_SASLDB2_DIR) 
    6573        rm -rf ./*~ 
    6674 
  • trunk/configs/dists/gentoo/Makefile

    r830 r906  
    99                cd ./awstats && $(MAKE) install ; cd .. ; \ 
    1010                cd ./bind && $(MAKE) install ; cd .. ; \ 
    11                 cd ./crontab && $(MAKE) install ; cd .. ; \ 
    1211                cd ./cron.d && $(MAKE) install ; cd .. ; \ 
    1312                cd ./database && $(MAKE) install ; cd .. ;  \ 
     
    2726                cd ./awstats && $(MAKE) uninstall ; cd .. ; \ 
    2827                cd ./bind && $(MAKE) uninstall ; cd .. ; \ 
    29                 cd ./crontab && $(MAKE) uninstall ; cd .. ; \ 
    3028                cd ./cron.d && $(MAKE) uninstall ; cd .. ; \ 
    3129                cd ./database && $(MAKE) uninstall ; cd .. ;  \ 
  • trunk/configs/dists/gentoo/apache/00_master.conf

    r839 r906  
    2929    Alias /ftp      {ROOT_DIR}/gui/tools/filemanager/ 
    3030 
    31     <IfModule mod_fastcgi.c> 
    32            SuexecUserGroup vu2000 vu2000 
     31        ScriptAlias /php4/ {PHP_STARTER_DIR}/master/ 
     32        ScriptAlias /php5/ {PHP_STARTER_DIR}/master/ 
     33 
     34    <IfModule suexec_module> 
     35         SuexecUserGroup vu2000 vu2000 
    3336    </IfModule> 
    3437 
     
    3841        Order allow,deny 
    3942        Allow from all 
     43 
     44                <IfModule mod_fcgid.c> 
     45#                       FCGIWrapper {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter .php 
     46                        FCGIWrapper {PHP_STARTER_DIR}/master/php5-fcgi-starter .php 
     47                        AddHandler fcgid-script .php 
     48                        Options +ExecCGI 
     49                </IfModule> 
     50                         
     51                <IfModule mod_fastcgi.c> 
     52#                       FCGIWrapper {PHP_STARTER_DIR}/master/php{PHP_VERSION}-fcgi-starter .php 
     53                        FCGIWrapper {PHP_STARTER_DIR}/master/php5-fcgi-starter .php 
     54                        AddHandler fcgid-script .php 
     55                        Options +ExecCGI 
     56                </IfModule> 
    4057    </Directory> 
    4158 
    42     <IfModule mod_fastcgi.c> 
    43         ScriptAlias /php4/ {PHP_STARTER_DIR}/master/ 
    44         ScriptAlias /php5/ {PHP_STARTER_DIR}/master/ 
    45         <Directory "{PHP_STARTER_DIR}/master"> 
    46             AllowOverride None 
    47             Options +ExecCGI MultiViews -Indexes 
    48             Order allow,deny 
    49             Allow from all 
    50         </Directory> 
    51     </IfModule> 
     59    <Directory "{PHP_STARTER_DIR}/master"> 
     60                <IfModule mod_fcgid.c> 
     61                        AllowOverride None 
     62                        Options +ExecCGI MultiViews -Indexes 
     63                        Order allow,deny 
     64                        Allow from all 
     65                </IfModule> 
     66                <IfModule mod_fastcgi.c> 
     67                        AllowOverride None 
     68                        Options +ExecCGI MultiViews -Indexes 
     69                        Order allow,deny 
     70                        Allow from all 
     71                </IfModule> 
     72        </Directory> 
     73 
    5274 
    5375    <IfModule mod_php4.c> 
  • trunk/configs/dists/gentoo/apache/01_awstats.conf

    r848 r906  
    44# 
    55 
    6 Alias /awstatscss "/usr/share/doc/awstats/examples/css/" 
    7 Alias /awstatsicons "/usr/share/awstats/icon/" 
    8 Alias /awstatsjs "/usr/share/doc/awstats/examples/js/" 
     6Alias /awstatsicons "{AWSTATS_WEB_DIR}/icon/" 
    97 
    108 
     
    1917    </IfModule> 
    2018 
    21     ScriptAlias /awstats "/usr/lib/cgi-bin/awstats.pl" 
     19    ScriptAlias /awstats "{AWSTATS_ENGINE_DIR}/awstats.pl" 
    2220 
    23     <Directory /usr/lib/cgi-bin
     21    <Directory {AWSTATS_ENGINE_DIR}
    2422        AllowOverride none 
    2523        Options +ExecCGI 
  • trunk/configs/dists/gentoo/apache/Makefile

    r841 r906  
    99        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/sites-available 
    1010        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/mods-available 
     11        $(SYSTEM_MAKE_DIRS) $(ROOT_APACHE_CONF)/ispcp 
    1112 
    1213        cp ./httpd.conf ./working/ispcp.conf 
  • trunk/configs/dists/gentoo/apache/fastcgi.conf

    r848 r906  
    2525# - Finish config Fastcgi 
    2626 
    27 <IfDefine FCGID> 
    28         <IfModule mod_fastcgi.c> 
    29                 FastCgiWrapper On 
    30                 FastCgiIpcDir /var/lib/apache2/fastcgi 
    31                 FastCgiConfig -minProcesses 1 -maxProcesses 10 -singleThreshold 100 
    32                               #-killInterval 300 \ 
    33                               #-autoUpdate \ 
    34                               #-idle-timeout 240 \ 
    35                               #-pass-header HTTP_AUTHORIZATION 
     27<IfModule mod_fastcgi.c> 
     28        FastCgiWrapper On 
     29        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 
    3635 
    37                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} 
     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} 
    3837 
    39                
    40                # PHP{PHP_VERSION} SUPPORT 
    41                
     38       
     39        # PHP{PHP_VERSION} SUPPORT 
     40       
    4241 
    43                AddHandler php-fastcgi .php .php{PHP_VERSION} 
     42        AddHandler php-fastcgi .php .php{PHP_VERSION} 
    4443 
    45                <Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter> 
    46                    SetHandler fastcgi-script 
    47                    Options +ExecCGI 
    48                </Location> 
     44        <Location /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter> 
     45            SetHandler fastcgi-script 
     46            Options +ExecCGI 
     47        </Location> 
    4948 
    50                 Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter 
    51                 AddType application/x-httpd-php .php .php{PHP_VERSION} 
    52         </IfModule> 
    53 </IfDefine> 
     49        Action php-fastcgi /php{PHP_VERSION}/php{PHP_VERSION}-fcgi-starter 
     50        AddType application/x-httpd-php .php .php{PHP_VERSION} 
     51</IfModule> 
  • trunk/configs/dists/gentoo/apache/httpd.conf

    r432 r906  
    1818 
    1919# 
    20 # AWStats 
     20# mod_cband configuration 
    2121# 
    2222 
    23 Alias /awstatsclasses "/var/www/awstats/classes/" 
    24 Alias /awstatscss "/var/www/awstats/css/" 
    25 Alias /awstatsicons "/var/www/awstats/icon/" 
    26 Alias /awstatsjs "/var/www/awstats/js/" 
    27 Alias /stats "/usr/lib/cgi-bin/awstats/" 
    28  
    29 <Directory /usr/lib/cgi-bin/awstats> 
    30     AllowOverride AuthConfig 
    31     Options -Includes FollowSymLinks +ExecCGI MultiViews 
    32     AddHandler cgi-script cgi pl 
    33     DirectoryIndex awstats.pl 
    34     Order deny,allow 
    35     Allow from all 
    36 </Directory> 
     23<IfModule mod_cband.c> 
     24    CBandScoreFlushPeriod 10 
     25    CBandRandomPulse On 
     26</IfModule> 
    3727 
    3828# 
  • trunk/configs/dists/gentoo/apache/parts/als_entry.tpl

    r833 r906  
    66    # 
    77 
    8     SuexecUserGroup {SUEXEC_USER} {SUEXEC_GROUP} 
     8    <IfModule suexec_module> 
     9           SuexecUserGroup {SUEXEC_USER} {SUEXEC_GROUP} 
     10    </IfModule> 
    911 
    1012    ServerAdmin     webmaster@{ALS_NAME} 
     
    5052    </Directory> 
    5153 
     54    Include {CUSTOM_SITES_CONFIG_DIR}/{ALS_NAME}.conf 
     55 
    5256</VirtualHost> 
  • trunk/configs/dists/gentoo/apache/parts/dmn_entry.tpl

    r835 r906  
    11<VirtualHost {DMN_IP}:80> 
    22 
    3     SuexecUserGroup {SUEXEC_USER} {SUEXEC_GROUP} 
     3    <IfModule suexec_module> 
     4           SuexecUserGroup {SUEXEC_USER} {SUEXEC_GROUP} 
     5    </IfModule> 
    46 
    57    ServerAdmin     webmaster@{DMN_NAME} 
     
    4749    </Directory> 
    4850 
     51    Include {CUSTOM_SITES_CONFIG_DIR}/{DMN_NAME}.conf 
     52 
    4953</VirtualHost> 
  • trunk/configs/dists/gentoo/apache/parts/sub_entry.tpl

    r833 r906  
    66    # 
    77 
    8     SuexecUserGroup {SUEXEC_USER} {SUEXEC_GROUP} 
     8    <IfModule suexec_module> 
     9           SuexecUserGroup {SUEXEC_USER} {SUEXEC_GROUP} 
     10    </IfModule> 
    911 
    1012    ServerAdmin     webmaster@{DMN_NAME} 
     
    4749    </Directory> 
    4850 
     51    Include {CUSTOM_SITES_CONFIG_DIR}/{SUB_NAME}.conf 
     52 
    4953</VirtualHost> 
  • trunk/configs/dists/gentoo/apache/working/ispcp.conf

    r512 r906  
    1818 
    1919# 
    20 # GUI Location. 
     20# mod_cband configuration 
    2121# 
    2222 
    23 Alias /ispcp /var/www/ispcp/gui 
    24 <Directory /var/www/ispcp/gui> 
    25     AllowOverride none 
    26     Options MultiViews IncludesNoExec FollowSymLinks 
    27     ErrorDocument 404 /ispcp/errordocs/index.php 
    28     DirectoryIndex index.html index.php 
    29 </Directory> 
    30  
    31 <Directory /var/www/ispcp/gui/tools/filemanager> 
    32     <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 </Directory> 
    37  
    38 Alias /ispcp_images /var/www/ispcp/gui/images 
    39 <Directory /var/www/ispcp/gui/images> 
    40     AllowOverride none 
    41     Options MultiViews IncludesNoExec FollowSymLinks 
    42 </Directory> 
    43  
    44 
    45 # AWStats 
    46 
    47  
    48 Alias /awstatsclasses "/var/www/awstats/classes/" 
    49 Alias /awstatscss "/var/www/awstats/css/" 
    50 Alias /awstatsicons "/var/www/awstats/icon/" 
    51 Alias /awstatsjs "/var/www/awstats/js/" 
    52 Alias /stats "/usr/lib/cgi-bin/awstats/" 
    53  
    54 <Directory /usr/lib/cgi-bin/awstats> 
    55     AllowOverride AuthConfig 
    56     Options -Includes FollowSymLinks +ExecCGI MultiViews 
    57     AddHandler cgi-script cgi pl 
    58     DirectoryIndex awstats.pl 
    59     Order deny,allow 
    60     Allow from all 
    61 </Directory> 
     23<IfModule mod_cband.c> 
     24    CBandScoreFlushPeriod 10 
     25    CBandRandomPulse On 
     26</IfModule> 
    6227 
    6328# 
  • trunk/configs/dists/gentoo/awstats/awstats.ispcp_tpl.conf

    r848 r906  
    166166# Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]" 
    167167# 
    168 HostAliases="www.{DOMAIN_NAME} REGEX[^.*\\{DOMAIN_NAME}$]" 
     168HostAliases="www.{DOMAIN_NAME} REGEX[^.*\.{DOMAIN_NAME}$]" 
    169169 
    170170 
     
    186186# Default: 2 
    187187# 
    188 DNSLookup=2 
     188DNSLookup=1 
    189189 
    190190 
  • trunk/configs/dists/gentoo/cron.d/Makefile

    r473 r906  
    33install: 
    44 
    5         $(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/cron.d 
    6         cp ./ispcp.phptemp $(ROOT_CONF)/cron.d 
    7          
     5        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/cron.d 
     6        cp ./ispcp $(SYSTEM_CONF)/cron.d 
     7        cp -R ./backup $(SYSTEM_CONF)/cron.d 
     8        cp -R ./parts $(SYSTEM_CONF)/cron.d 
     9        cp -R ./working $(SYSTEM_CONF)/cron.d 
     10        cp $(SYSTEM_CONF)/cron.d/ispcp $(SYSTEM_CONF)/cron.d/working 
     11 
    812uninstall: 
    913 
  • trunk/configs/dists/gentoo/cron.d/ispcp

    r848 r906  
     1 
     2# delayed tasks START. 
     3 
     4# Quota 
     5@daily root {QUOTA_ROOT_DIR}/ispcp-dsk-quota &>{LOG_DIR}/ispcp-dsk-quota.log 
     6 
     7# Traffic 
     80,30    *       *       *       *  root {TRAFF_ROOT_DIR}/ispcp-srv-traff &>{LOG_DIR}/ispcp-srv-traff.log 
     90,30    *       *       *       *  root {TRAFF_ROOT_DIR}/ispcp-vrl-traff >{LOG_DIR}/ispcp-vrl-traff.log  
     1015,45   *       *       *       *  root {TRAFF_ROOT_DIR}/ispcp-vrl-traff-correction &>{LOG_DIR}/ispcp-vrl-traff-correction.log 
     11 
     12# customer logs 
     13@daily root {TOOLS_ROOT_DIR}/ispcp-httpd-logs-mngr &>{LOG_DIR}/ispcp-httpd-logs-mngr.log 
     14 
     15# Backup 
     16@daily root {BACKUP_ROOT_DIR}/ispcp-backup-all yes &>{LOG_DIR}/ispcp-backup-all-mngr.log 
     17@daily root {BACKUP_ROOT_DIR}/ispcp-backup-ispcp noreport &>{LOG_DIR}/ispcp-backup-all-mngr.log 
     18 
     19# Remove config backups older than seven days 
     20@daily root find {CONF_DIR}/*/backup/* -maxdepth 0 -type f -mtime +7 -print | egrep '.*\.[0-9]+$' | xargs -r /bin/rm 
     21 
     22# Remove Daemon Logs older than 14 days (except .gz files) 
     23@daily root find {LOG_DIR}/* -maxdepth 1 -type f -mtime +14 -print | egrep '.*\.gz$' | xargs -r /bin/rm 
     24 
     25# AWStats 
     26{AW-ENABLED}15  */6     *       *       *       root {AWSTATS_ROOT_DIR}/awstats_updateall.pl now -awstatsprog={AWSTATS_ENGINE_DIR}/awstats.pl >/dev/null 2>&1 
     27 
     28# Rootkit Hunter 
     29{RK-ENABLED}0   */12    *       *       *       root {RKHUNTER} --scan-knownbad-files --check-deleted --createlogfile --cronjob --createlogfile {RKHUNTER_LOG}>/dev/null 2>&1 
     30 
     31# Chkrootkit 
     32{CR-ENABLED}0   */12    *       *       *       root {CHKROOTKIT} &> {CHKROOTKIT_LOG} 
     33 
     34# Look for and purge old sessions every 30 minutes 
     350,30 *     * * *     root   {TOOLS_ROOT_DIR}/ispcpphptemp.sh >/dev/null 2>&1 
     36 
     37# [{DMN_NAME}] backup task START. 
     38# [{DMN_NAME}] backup task END. 
     39 
     40# [{DMN_NAME}]:{CRONJOB_ID} custom task START. 
     41# [{DMN_NAME}]:{CRONJOB_ID} custom task END. 
     42 
     43# [{DMN_NAME}] AWStats static tasks START. 
     44# [{DMN_NAME}] AWStats static tasks END. 
     45 
     46# delayed tasks END. 
  • trunk/configs/dists/gentoo/cron.d/parts/dmn_awstats_b.tpl

    r848 r906  
    1 # AWStats static tasks START. 
     1# [{DMN_NAME}] AWStats static tasks START. 
  • trunk/configs/dists/gentoo/cron.d/parts/dmn_awstats_e.tpl

    r848 r906  
    1 # AWStats static tasks END. 
     1# [{DMN_NAME}] AWStats static tasks END. 
  • trunk/configs/dists/gentoo/cron.d/parts/dmn_awstats_entry.tpl

    r848 r906  
    1 {MINUTE} {HOUR}  * * *   perl /var/www/engine/awstats/awstats_buildstaticpages.pl -config={DMN_NAME} -update -lang=en -awstatsprog=/usr/lib/cgi-bin/awstats.pl -dir=/var/www/virtual/{DMN_NAME}/statistics/ 
     1{MINUTE} {HOUR}  * * *   root perl /var/www/ispcp/engine/awstats/awstats_buildstaticpages.pl -config={DMN_NAME} -update -lang=en -awstatsprog=/usr/lib/cgi-bin/awstats.pl -dir=/var/www/virtual/{DMN_NAME}/statistics/ >/dev/null 2>&1 
  • trunk/configs/dists/gentoo/database/database.sql

    r785 r906  
    2222  `customer_id` varchar(200) default 0, 
    2323  `created_by` int(10) unsigned default 0, 
    24   `fname` varchar(200) default ''
    25   `lname` varchar(200) default ''
    26   `gender` varchar(1) default ''
    27   `firm` varchar(200) default ''
    28   `zip` varchar(10) default ''
    29   `city` varchar(200) default ''
    30   `country` varchar(200) default ''
     24  `fname` varchar(200) default NULL
     25  `lname` varchar(200) default NULL
     26  `gender` varchar(1) default NULL
     27  `firm` varchar(200) default NULL
     28  `zip` varchar(10) default NULL
     29  `city` varchar(200) default NULL
     30  `country` varchar(200) default NULL
    3131  `email` varchar(200) default NULL, 
    32   `phone` varchar(200) default ''
    33   `fax` varchar(200) default ''
    34   `street1` varchar(200) default ''
    35   `street2` varchar(200) default ''
     32  `phone` varchar(200) default NULL
     33  `fax` varchar(200) default NULL
     34  `street1` varchar(200) default NULL
     35  `street2` varchar(200) default NULL
    3636  `uniqkey` varchar(255) default NULL, 
    3737  `uniqkey_time` timestamp NULL default NULL, 
     
    6161  `name` varchar(255) NOT NULL default '', 
    6262  `value` varchar(255) NOT NULL default '', 
    63   PRIMARY KEY (`name`) 
     63  PRIMARY KEY (`name`) 
    6464) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; 
    6565 
     
    9797),( 
    9898'PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1' 
     99),( 
     100'PORT_POLICYD-WEIGHT', '12525;tcp;POLICYD-WEIGHT;1;1' 
    99101); 
    100102 
     
    387389  `fname` varchar(200) default NULL, 
    388390  `lname` varchar(200) default NULL, 
     391  `gender` varchar(1) default NULL, 
    389392  `firm` varchar(200) default NULL, 
    390393  `zip` varchar(10) default NULL, 
  • trunk/configs/dists/gentoo/database/languages.sql

    r786 r906  
    11-- phpMyAdmin SQL Dump 
    2 -- version 2.10.1 
     2-- version 2.11.1 
    33-- http://www.phpmyadmin.net 
    4 -- 31. Mai 2007 um 22:11 
     4-- 
     5-- Host: localhost:3306 
     6-- Erstellungszeit: 15. Oktober 2007 um 00:34 
     7-- Server Version: 5.0.32 
     8-- PHP-Version: 5.2.0-8+etch5~pu1 
    59 
    610SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; 
     
    1620-- 
    1721 
     22DROP TABLE IF EXISTS `lang_English`; 
    1823CREATE TABLE `lang_English` ( 
    1924  `msgid` text collate utf8_unicode_ci, 
  • trunk/configs/dists/gentoo/fcgi/parts/php4/php.ini

    r848 r906  
    6868engine = On 
    6969 
    70 ; Allow the <? tag.  Otherwise, only <?php and <script> tags are recognized.   
     70; Allow the <? tag.  Otherwise, only <?php and <script> tags are recognized. 
    7171; NOTE: Using short tags should be avoided when developing applications or 
    7272; libraries that are meant for redistribution, or deployment on PHP 
     
    134134; A warning appears if the specified function is not defined, or if the 
    135135; function doesn't include/implement the missing class. 
    136 ; So only set this entry, if you really want to implement such a  
     136; So only set this entry, if you really want to implement such a 
    137137; callback-function. 
    138138unserialize_callback_func= 
     
    172172; (directory must also be in include_path or full path must 
    173173; be used when including) 
    174 safe_mode_include_dir =         
     174safe_mode_include_dir = 
    175175 
    176176; When safe_mode is on, only executables located in the safe_mode_exec_dir 
     
    209209; It receives a comma-delimited list of function names. This directive is 
    210210; *NOT* affected by whether Safe Mode is turned On or Off. 
    211 disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, shell, symlink 
     211disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, shell, symlink, popen, proc_open 
    212212 
    213213; This directive allows you to disable certain classes for security reasons. 
     
    307307ignore_repeated_errors = Off 
    308308 
    309 ; Ignore source of message when ignoring repeated messages. When this setting  
     309; Ignore source of message when ignoring repeated messages. When this setting 
    310310; is On you will not log errors with repeated messages from different files or 
    311311; sourcelines. 
     
    313313 
    314314; If this parameter is set to Off, then memory leaks will not be shown (on 
    315 ; stdout or in the log). This has only effect in a debug compile, and if  
     315; stdout or in the log). This has only effect in a debug compile, and if 
    316316; error reporting includes E_WARNING in the allowed list 
    317317report_memleaks = On 
     
    322322; Disable the inclusion of HTML tags in error messages. 
    323323;html_errors = Off 
    324    
    325 ; If html_errors is set On PHP produces clickable error messages that direct  
     324; If html_errors is set On PHP produces clickable error messages that direct 
    326325; to a page describing the error or function causing the error in detail. 
    327 ; You can download a copy of the PHP manual from http://www.php.net/docs.php  
     326; You can download a copy of the PHP manual from http://www.php.net/docs.php 
    328327; and change docref_root to the base URL of your local copy including the 
    329 ; leading '/'. You must also specify the file extension being used including  
     328; leading '/'. You must also specify the file extension being used including 
    330329; the dot. 
    331330;docref_root = "/phpmanual/" 
    332331;docref_ext = .html 
    333    
    334332; String to output before an error message. 
    335333;error_prepend_string = "<font color=ff0000>" 
     
    352350 
    353351; The separator used in PHP generated URLs to separate arguments. 
    354 ; Default is "&".  
     352; Default is "&". 
    355353;arg_separator.output = "&amp;" 
    356354 
    357355; List of separator(s) used by PHP to parse input URLs into variables. 
    358 ; Default is "&".  
     356; Default is "&". 
    359357; NOTE: Every character in this directive is considered as separator! 
    360358;arg_separator.input = ";&" 
     
    400398 
    401399; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. 
    402 magic_quotes_runtime = Off     
     400magic_quotes_runtime = Off 
    403401 
    404402; Use Sybase-style magic quotes (escape ' with '' instead of \'). 
     
    425423;;;;;;;;;;;;;;;;;;;;;;;;; 
    426424 
    427 ; UNIX: "/path1:/path2"   
     425; UNIX: "/path1:/path2" 
    428426;include_path = ".:/usr/share/php" 
    429427; 
     
    460458; cgi.nph = 1 
    461459 
    462 ; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape  
     460; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape 
    463461; (iPlanet) web servers, you MAY need to set an environment variable name that PHP 
    464462; will look for to know it is OK to continue execution.  Setting this variable MAY 
     
    489487; RFC2616 compliant header. 
    490488; Default is zero. 
    491 ;cgi.rfc2616_headers = 0  
    492   
     489;cgi.rfc2616_headers = 0 
     490 
    493491 
    494492;;;;;;;;;;;;;;;; 
     
    548546;   extension=msql.so 
    549547; 
    550 ; Note that it should be the name of the module only; no directory information  
     548; Note that it should be the name of the module only; no directory information 
    551549; needs to go here.  Specify the location of the extension with the 
    552550; extension_dir directive above. 
     
    582580;java.class.path = .\php_java.jar 
    583581;java.home = c:\jdk 
    584 ;java.library = c:\jdk\jre\bin\hotspot\jvm.dll  
     582;java.library = c:\jdk\jre\bin\hotspot\jvm.dll 
    585583;java.library.path = .\ 
    586584 
     
    603601 
    604602; Maximum number of links (persistent + non-persistent).  -1 means no limit. 
    605 odbc.max_links = -1   
     603odbc.max_links = -1 
    606604 
    607605; Handling of LONG fields.  Returns number of bytes to variables.  0 means 
    608606; passthru. 
    609 odbc.defaultlrl = 4096   
     607odbc.defaultlrl = 4096 
    610608 
    611609; Handling of binary data.  0 means passthru, 1 return as is, 2 convert to char. 
    612610; See the documentation on odbc_binmode and odbc_longreadlen for an explanation 
    613611; of uodbc.defaultlrl and uodbc.defaultbinmode 
    614 odbc.defaultbinmode = 1   
     612odbc.defaultbinmode = 1 
    615613 
    616614[MySQL] 
     
    669667 
    670668; Detect broken persistent links always with pg_pconnect(). Need a little overhead. 
    671 pgsql.auto_reset_persistent = Off  
     669pgsql.auto_reset_persistent = Off 
    672670 
    673671; Maximum number of persistent links.  -1 means no limit. 
     
    784782 
    785783; Argument passed to save_handler.  In the case of files, this is the path 
    786 ; where data files are stored. Note: Windows users have to change this  
     784; where data files are stored. Note: Windows users have to change this 
    787785; variable in order to use PHP's session functions. 
    788786; As of PHP 4.0.1, you can define the path as: 
    789787;     session.save_path = "N;/path" 
    790 ; where N is an integer.  Instead of storing all the session files in  
    791 ; /path, what this will do is use subdirectories N-levels deep, and  
    792 ; store the session data in those directories.  This is useful if you  
    793 ; or your OS have problems with lots of files in one directory, and is  
     788; where N is an integer.  Instead of storing all the session files in 
     789; /path, what this will do is use subdirectories N-levels deep, and 
     790; store the session data in those directories.  This is useful if you 
     791; or your OS have problems with lots of files in one directory, and is 
    794792; a more efficient layout for servers that handle lots of sessions. 
    795793; NOTE 1: PHP will not create this directory structure automatically. 
     
    842840; NOTE: If you are using the subdirectory option for storing session files 
    843841;       (see session.save_path above), then garbage collection does *not* 
    844 ;       happen automatically.  You will need to do your own garbage  
    845 ;       collection through a shell script, cron entry, or some other method.  
     842;       happen automatically.  You will need to do your own garbage 
     843;       collection through a shell script, cron entry, or some other method. 
    846844;       For example, the following script would is the equivalent of 
    847845;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): 
     
    880878 
    881879; trans sid support is disabled by default. 
    882 ; Use of trans sid may risk your users security.  
     880; Use of trans sid may risk your users security. 
    883881; Use this option with caution. 
    884882; - User may send URL contains active session ID 
     
    10041002[com] 
    10051003; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs 
    1006 ;com.typelib_file =  
     1004;com.typelib_file = 
    10071005; allow Distributed-COM calls 
    10081006;com.allow_dcom = true 
     
    10331031;mbstring.http_output = SJIS 
    10341032 
    1035 ; enable automatic encoding translation according to  
     1033; enable automatic encoding translation according to 
    10361034; mbstring.internal_encoding setting. Input chars are 
    10371035; converted to internal encoding by setting this to On. 
     
    10411039 
    10421040; automatic encoding detection order. 
    1043 ; auto means  
     1041; auto means 
    10441042;mbstring.detect_order = auto 
    10451043 
     
    10611059;fbsql.allow_persistent = On 
    10621060;fbsql.autocommit = On 
    1063 ;fbsql.default_database =  
     1061;fbsql.default_database = 
    10641062;fbsql.default_database_password = 
    10651063;fbsql.default_host = 
     
    10791077 
    10801078[exif] 
    1081 ; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.  
     1079; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. 
    10821080; With mbstring support this will automatically be converted into the encoding 
    1083 ; given by corresponding encode setting. When empty mbstring.internal_encoding  
    1084 ; is used. For the decode settings you can distinguish between motorola and  
     1081; given by corresponding encode setting. When empty mbstring.internal_encoding 
     1082; is used. For the decode settings you can distinguish between motorola and 
    10851083; intel byte order. A decode setting cannot be empty. 
    10861084;exif.encode_unicode = ISO-8859-15 
    10871085;exif.decode_unicode_motorola = UCS-2BE 
    10881086;exif.decode_unicode_intel    = UCS-2LE 
    1089 ;exif.encode_jis =  
     1087;exif.encode_jis = 
    10901088;exif.decode_jis_motorola = JIS 
    10911089;exif.decode_jis_intel    = JIS 
  • trunk/configs/dists/gentoo/fcgi/parts/php5/php.ini

    r848 r906  
    220220; It receives a comma-delimited list of function names. This directive is 
    221221; *NOT* affected by whether Safe Mode is turned On or Off. 
    222 disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, shell, symlink 
     222disable_functions = show_source, system, shell_exec, passthru, exec, phpinfo, shell, symlink, popen, proc_open 
    223223 
    224224; This directive allows you to disable certain classes for security reasons. 
     
    690690;pcre.backtrack_limit=100000 
    691691 
    692 ;PCRE library recursion limit.  
    693 ;Please note that if you set this value to a high number you may consume all  
    694 ;the available process stack and eventually crash PHP (due to reaching the  
     692;PCRE library recursion limit. 
     693;Please note that if you set this value to a high number you may consume all 
     694;the available process stack and eventually crash PHP (due to reaching the 
    695695;stack size limit imposed by the Operating System). 
    696696;pcre.recursion_limit=100000 
     
    11611161;mssql.max_procs = -1 
    11621162 
    1163 ; Specify client character set.  
     1163; Specify client character set. 
    11641164; If empty or not set the client charset from freetds.comf is used 
    11651165; This is only used when compiled with FreeTDS 
     
    12841284; Sets the directory name where SOAP extension will put cache files. 
    12851285soap.wsdl_cache_dir="{WWW_DIR}/{DMN_NAME}/phptmp/" 
    1286 ; (time to live) Sets the number of second while cached file will be used  
     1286; (time to live) Sets the number of second while cached file will be used 
    12871287; instead of original one. 
    12881288soap.wsdl_cache_ttl=86400 
  • trunk/configs/dists/gentoo/ispcp.conf

    r848 r906  
    3737CMD_CAT = /bin/cat 
    3838 
     39CMD_CHMOD = /bin/chmod 
     40 
    3941CMD_CP = /bin/cp 
    4042 
     
    6668 
    6769CMD_RM = /bin/rm 
     70 
     71CMD_SHELL = /bin/bash 
    6872 
    6973CMD_TAR = /bin/tar 
     
    124128PHP5_FASTCGI_BIN = /usr/lib/php5/bin/php-cgi 
    125129 
    126 PHP_VERSION = 4 
     130PHP_VERSION = 5 
    127131 
    128132# 
     
    183187APACHE_SITES_DIR = /etc/apache2/vhosts.d/ 
    184188 
     189APACHE_CUSTOM_SITES_CONFIG_DIR = /etc/apache2/ispcp 
     190 
    185191APACHE_SUEXEC_USER_PREF = vu 
    186192 
     
    229235MTA_MAILBOX_GID_NAME = mail 
    230236 
    231 MTA_SASLDB_LOCAL_DOMAIN = isp-control.net 
    232  
    233237MTA_SASLDB_FILE = /var/spool/postfix/etc/sasldb2 
    234238 
     
    260264 
    261265BACKUP_MINUTE = 40 
     266 
     267BACKUP_ISPCP = yes 
     268 
     269BACKUP_DOMAINS = yes 
    262270 
    263271BACKUP_ROOT_DIR = /var/www/ispcp/engine/backup 
     
    306314MAIL_TRAFF_LOG = mail.log 
    307315 
    308 PREV_TRAFF_LOG_MAX_SIZE = 10485760 
     316PREV_TRAFF_LOG_MAX_SIZE = 70391808 
    309317 
    310318TRAFF_ROOT_DIR = /var/www/ispcp/engine/traffic 
     
    382390 
    383391BACKUP_FILE_DIR = /var/www/ispcp/backups 
     392 
     393# 
     394# Developer Mode 
     395# 
     396 
     397DEBUG = 0 
  • trunk/configs/dists/gentoo/logrotate/ispcp

    r848 r906  
    99        sharedscripts 
    1010        prerotate 
    11                 /var/www/ispcp/engine/traffic/ispcp-srv-traff &>/var/log/ispcp/ispcp-srv-traff.log 
     11                /var/www/ispcp/engine/traffic/ispcp-vrl-traff >/var/log/ispcp/ispcp-vrl-traff.log 
    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`; do 
     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} 
     23 
    1924/var/log/proftpd/xferlog { 
    2025  daily 
     
    3540  delaycompress 
    3641  prerotate 
    37     /var/www/engine/traffic/ispcp-vrl-traff &> /var/log/ispcp-vrl-traff.log 
     42    /var/www/ispcp/engine/traffic/ispcp-vrl-traff > /var/log/ispcp/ispcp-vrl-traff.log 
    3843  endscript 
    3944  postrotate