docs/INSTALL_DEBIAN_5.0.txt
@@ -132,6 +132,16 @@ /etc/init.d/openbsd-inetd restart # Some additional settings for pureftpd echo 'yes' > /etc/pure-ftpd/conf/DontResolve # Enable TLS in pureftpd echo 1 > /etc/pure-ftpd/conf/TLS mkdir -p /etc/ssl/private/ openssl req -x509 -nodes -newkey rsa:1024 -keyout /etc/ssl/private/pure-ftpd.pem -out /etc/ssl/private/pure-ftpd.pem chmod 600 /etc/ssl/private/pure-ftpd.pem # Edit /etc/fstab. Mine looks like this (I added ,usrquota,grpquota to the partition with the mount point /): @@ -243,6 +253,14 @@ apt-get install vlogger webalizer Change the following line in /etc/webalizer.conf from #Incremental no to Incremental yes 7) Install Jailkit (optional, only needed if you want to use chrroting for SSH users) apt-get install build-essential autoconf automake1.9 libtool flex bison install/dist/conf/centos53.conf.php
New file @@ -0,0 +1,152 @@ <?php /* Copyright (c) 2007, Till Brehm, projektfarm Gmbh All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of ISPConfig nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ //*** Fedora 9 default settings //* Main $conf['language'] = 'en'; $conf['distname'] = 'centos52'; $conf['hostname'] = 'server1.domain.tld'; // Full hostname $conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error $conf['server_id'] = 1; $conf['init_scripts'] = '/etc/init.d'; $conf['runlevel'] = '/etc'; $conf['shells'] = '/etc/shells'; $conf['cron_tab'] = '/var/spool/cron/root'; $conf['pam'] = '/etc/pam.d'; //* Services provided by this server, this selection will be overridden by the expert mode $conf['services']['mail'] = true; $conf['services']['web'] = true; $conf['services']['dns'] = true; $conf['services']['file'] = true; $conf['services']['db'] = true; $conf['services']['vserver'] = true; //* MySQL $conf['mysql']['installed'] = false; // will be detected automatically during installation $conf['mysql']['init_script'] = 'mysqld'; $conf['mysql']['host'] = 'localhost'; $conf['mysql']['ip'] = '127.0.0.1'; $conf['mysql']['port'] = '3306'; $conf['mysql']['database'] = 'dbispconfig'; $conf['mysql']['admin_user'] = 'root'; $conf['mysql']['admin_password'] = ''; $conf['mysql']['charset'] = 'utf8'; $conf['mysql']['ispconfig_user'] = 'ispconfig'; $conf['mysql']['ispconfig_password'] = md5 (uniqid (rand())); $conf['mysql']['master_slave_setup'] = 'n'; $conf['mysql']['master_host'] = ''; $conf['mysql']['master_database'] = 'dbispconfig'; $conf['mysql']['master_admin_user'] = 'root'; $conf['mysql']['master_admin_password'] = ''; $conf['mysql']['master_ispconfig_user'] = ''; $conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand())); //* Apache $conf['apache']['installed'] = false; // will be detected automatically during installation $conf['apache']['user'] = 'apache'; $conf['apache']['group'] = 'apache'; $conf['apache']['init_script'] = 'httpd'; $conf['apache']['version'] = '2.2'; $conf['apache']['vhost_conf_dir'] = '/etc/httpd/conf/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/httpd/conf/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; //* Website base settings $conf['web']['website_basedir'] = '/var/www'; $conf['web']['website_path'] = '/var/www/clients/client[client_id]/web[website_id]'; $conf['web']['website_symlinks'] = '/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/'; //* Fastcgi $conf['fastcgi']['fastcgi_phpini_path'] = '/etc/'; $conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/'; //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation $conf['postfix']['config_dir'] = '/etc/postfix'; $conf['postfix']['init_script'] = 'postfix'; $conf['postfix']['user'] = 'postfix'; $conf['postfix']['group'] = 'postfix'; $conf['postfix']['vmail_userid'] = '5000'; $conf['postfix']['vmail_username'] = 'vmail'; $conf['postfix']['vmail_groupid'] = '5000'; $conf['postfix']['vmail_groupname'] = 'vmail'; $conf['postfix']['vmail_mailbox_base'] = '/var/vmail'; //* Getmail $conf['getmail']['installed'] = false; // will be detected automatically during installation $conf['getmail']['config_dir'] = '/etc/getmail'; $conf['getmail']['program'] = '/usr/bin/getmail'; //* Courier $conf['courier']['installed'] = false; // will be detected automatically during installation $conf['courier']['config_dir'] = '/etc/authlib'; $conf['courier']['courier-authdaemon'] = 'courier-authlib'; $conf['courier']['courier-imap'] = 'courier-imap'; $conf['courier']['courier-imap-ssl'] = ''; $conf['courier']['courier-pop'] = ''; $conf['courier']['courier-pop-ssl'] = ''; //* SASL $conf['saslauthd']['installed'] = false; // will be detected automatically during installation $conf['saslauthd']['config'] = '/etc/sysconfig/saslauthd'; $conf['saslauthd']['init_script'] = 'saslauthd'; //* Amavisd $conf['amavis']['installed'] = false; // will be detected automatically during installation $conf['amavis']['config_dir'] = '/etc'; $conf['amavis']['init_script'] = 'amavisd'; //* ClamAV $conf['clamav']['installed'] = false; // will be detected automatically during installation $conf['clamav']['init_script'] = 'clamd'; //* Pureftpd $conf['pureftpd']['installed'] = false; // will be detected automatically during installation $conf['pureftpd']['config_dir'] = '/etc/pure-ftpd'; $conf['pureftpd']['init_script'] = 'pure-ftpd'; //* MyDNS $conf['mydns']['installed'] = false; // will be detected automatically during installation $conf['mydns']['config_dir'] = '/etc'; $conf['mydns']['init_script'] = 'mydns'; //* Jailkit $conf['jailkit']['installed'] = false; // will be detected automatically during installation $conf['jailkit']['config_dir'] = '/etc/jailkit'; $conf['jailkit']['jk_init'] = 'jk_init.ini'; $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini'; $conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano'; ?> install/dist/lib/centos53.lib.php
New file @@ -0,0 +1,86 @@ <?php /* Copyright (c) 2007, Till Brehm, projektfarm Gmbh All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of ISPConfig nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ class installer extends installer_dist { public function configure_amavis() { global $conf; // amavisd user config file $configfile = 'fedora_amavisd_conf'; if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~'); if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~'); $content = rf("tpl/".$configfile.".master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content); $content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content); $content = str_replace('{mysql_server_port}',$conf["mysql"]["port"],$content); $content = str_replace('{mysql_server_ip}',$conf['mysql']['ip'],$content); $content = str_replace('{hostname}',$conf['hostname'],$content); $content = str_replace('/var/spool/amavisd/clamd.sock','/var/run/clamav/clamd.sock',$content); wf($conf["amavis"]["config_dir"].'/amavisd.conf',$content); // Adding the amavisd commands to the postfix configuration $postconf_commands = array ( 'content_filter = amavis:[127.0.0.1]:10024', 'receive_override_options = no_address_mappings' ); // Make a backup copy of the main.cf file copy($conf["postfix"]["config_dir"].'/main.cf',$conf["postfix"]["config_dir"].'/main.cf~2'); // Executing the postconf commands foreach($postconf_commands as $cmd) { $command = "postconf -e '$cmd'"; caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); } // Append the configuration for amavisd to the master.cf file if(is_file($conf["postfix"]["config_dir"].'/master.cf')) copy($conf["postfix"]["config_dir"].'/master.cf',$conf["postfix"]["config_dir"].'/master.cf~'); $content = rf($conf["postfix"]["config_dir"].'/master.cf'); // Only add the content if we had not addded it before if(!stristr($content,"127.0.0.1:10025")) { unset($content); $content = rf("tpl/master_cf_amavis.master"); af($conf["postfix"]["config_dir"].'/master.cf',$content); } unset($content); removeLine('/etc/sysconfig/freshclam','FRESHCLAM_DELAY=disabled-warn # REMOVE ME',1); replaceLine('/etc/freshclam.conf','Example','# Example',1); } } ?> install/dist/lib/fedora.lib.php
@@ -208,6 +208,8 @@ $configfile = 'tpl/fedora_saslauthd_smtpd_conf.master'; $content = rf($configfile); wf('/usr/lib/sasl2/smtpd.conf',$content); if(is_dir('/usr/lib64')) wf('/usr/lib64/sasl/smtpd.conf',$content); if(is_dir('/usr/lib64')) wf('/usr/lib64/sasl2/smtpd.conf',$content); }
@@ -599,6 +599,8 @@ $content = str_replace('{server_id}', $conf['server_id'], $content); $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content); $content = str_replace('{language}', $conf['language'], $content); wf("$install_dir/server/lib/$configfile", $content);
@@ -149,7 +149,7 @@ } elseif(stristr($content,'CentOS release 5.3 (Final)')) { $distname = 'CentOS'; $distver = '5.3'; $distid = 'centos52'; $distid = 'centos53'; $distbaseid = 'fedora'; swriteln("Operating System: CentOS 5.3 or compatible\n"); } else { install/sql/ispconfig3.sql
@@ -1148,7 +1148,7 @@ -- Dumping data for table `sys_config` -- INSERT INTO sys_config VALUES ('1','db','db_version','3.0.1.2'); INSERT INTO sys_config VALUES ('1','db','db_version','3.0.1.3'); -- --------------------------------------------------------
@@ -57,7 +57,7 @@ //** Application define('ISPC_APP_TITLE', 'ISPConfig'); define('ISPC_APP_VERSION', '3.0.1.2'); define('ISPC_APP_VERSION', '3.0.1.3'); //** Database install/update.php
@@ -89,6 +89,7 @@ $conf["mysql"]["ispconfig_user"] = $conf_old["db_user"]; $conf["mysql"]["ispconfig_password"] = $conf_old["db_password"]; $conf['language'] = $conf_old['language']; if($conf['language'] == '{language}') $conf['language'] = 'en'; if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"]; if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"]; interface/lib/app.inc.php
@@ -1,7 +1,7 @@ <?php /* Copyright (c) 2007, Till Brehm, projektfarm Gmbh Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -147,19 +147,21 @@ } } /** Loads language */ /** Translates strings in current language */ public function lng($text) { if($this->_language_inc != 1) { //* loading global and module Wordbook // TODO: this need to be made clearer somehow - pedro @include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng'); //@include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng'); $this->load_language_file('/lib/lang/'.$_SESSION['s']['language'].'.lng'); if(isset($_SESSION['s']['module']['name']) && isset($_SESSION['s']['language'])) { $lng_file = ISPC_ROOT_PATH.'/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng'; if(!file_exists($lng_file)) $lng_file = ISPC_ROOT_PATH.'/web/'.$_SESSION['s']['module']['name'].'/lib/lang/en.lng'; @include_once($lng_file); $lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng'; if(!file_exists($lng_file)) $lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/en.lng'; //@include_once($lng_file); $this->load_language_file($lng_file); } if(isset($wb)) $this->_wb = $wb; //if(isset($wb)) $this->_wb = $wb; $this->_language_inc = 1; } if(!empty($this->_wb[$text])) { @@ -168,6 +170,22 @@ return $text; } //** Helper function to load the language files. public function load_language_file($filename) { $filename = ISPC_ROOT_PATH.'/'.$filename; if(substr($filename,-4) != '.lng') $this->error('Language file has wrong extension.'); if(file_exists($filename)) { @include_once($filename); if(is_array($wb)) { if(is_array($this->_wb)) { $this->_wb = array_merge($wb,$this->_wb); } else { $this->_wb = $wb; } } } } public function tpl_defaults() { $this->tpl->setVar('app_title', $this->_conf['app_title']); interface/web/dns/dns_wizard.php
@@ -39,6 +39,7 @@ $app->uses('tpl,validate_dns'); $app->tpl->newTemplate("form.tpl.htm"); $app->tpl->setInclude('content_tpl','templates/dns_wizard.htm'); $app->load_language_file('/web/dns/lib/lang/'.$_SESSION['s']['language'].'_dns_wizard.lng'); // import variables $template_id = (isset($_POST['template_id']))?intval($_POST['template_id']):0; @@ -109,11 +110,11 @@ $error = ''; if(isset($_POST['domain']) && $_POST['domain'] == '') $error .= $app->lng('error_domain_empty'); if(isset($_POST['ip']) && $_POST['ip'] == '') $error .= $app->lng('error_ip_empty'); if(isset($_POST['ns1']) && $_POST['ns1'] == '') $error .= $app->lng('error_ns1_empty'); if(isset($_POST['ns2']) && $_POST['ns2'] == '') $error .= $app->lng('error_ns2_empty'); if(isset($_POST['email']) && $_POST['email'] == '') $error .= $app->lng('error_email_empty'); if(isset($_POST['domain']) && $_POST['domain'] == '') $error .= $app->lng('error_domain_empty').'<br />'; if(isset($_POST['ip']) && $_POST['ip'] == '') $error .= $app->lng('error_ip_empty').'<br />'; if(isset($_POST['ns1']) && $_POST['ns1'] == '') $error .= $app->lng('error_ns1_empty').'<br />'; if(isset($_POST['ns2']) && $_POST['ns2'] == '') $error .= $app->lng('error_ns2_empty').'<br />'; if(isset($_POST['email']) && $_POST['email'] == '') $error .= $app->lng('error_email_empty').'<br />'; // replace template placeholders @@ -164,14 +165,14 @@ } // end foreach if($vars['origin'] == '') $error .= $app->lng('error_origin_empty'); if($vars['ns'] == '') $error .= $app->lng('error_ns_empty'); if($vars['mbox'] == '') $error .= $app->lng('error_mbox_empty'); if($vars['refresh'] == '') $error .= $app->lng('error_refresh_empty'); if($vars['retry'] == '') $error .= $app->lng('error_retry_empty'); if($vars['expire'] == '') $error .= $app->lng('error_expire_empty'); if($vars['minimum'] == '') $error .= $app->lng('error_minimum_empty'); if($vars['ttl'] == '') $error .= $app->lng('error_ttl_empty'); if($vars['origin'] == '') $error .= $app->lng('error_origin_empty').'<br />'; if($vars['ns'] == '') $error .= $app->lng('error_ns_empty').'<br />'; if($vars['mbox'] == '') $error .= $app->lng('error_mbox_empty').'<br />'; if($vars['refresh'] == '') $error .= $app->lng('error_refresh_empty').'<br />'; if($vars['retry'] == '') $error .= $app->lng('error_retry_empty').'<br />'; if($vars['expire'] == '') $error .= $app->lng('error_expire_empty').'<br />'; if($vars['minimum'] == '') $error .= $app->lng('error_minimum_empty').'<br />'; if($vars['ttl'] == '') $error .= $app->lng('error_ttl_empty').'<br />'; if($error == '') { // Insert the soa record interface/web/dns/lib/lang/en_dns_wizard.lng
@@ -10,7 +10,18 @@ $wb['ns1_txt'] = 'NS 1'; $wb['ns2_txt'] = 'NS 2'; $wb['ip_txt'] = 'IP Address'; $wb['error_origin_empty'] = 'Origin empty.'; $wb['error_ns_empty'] = 'NS empty.'; $wb['error_mbox_empty'] = 'Mbox empty.'; $wb['error_refresh_empty'] = 'Refresh empty.'; $wb['error_retry_empty'] = 'Retry empty.'; $wb['error_expire_empty'] = 'Expire empty.'; $wb['error_minimum_empty'] = 'Minimum empty.'; $wb['error_ttl_empty'] = 'TTL empty.'; $wb['error_domain_empty'] = 'Domain empty'; $wb['error_ip_empty'] = 'IP empty.'; $wb['error_ns1_empty'] = 'NS1 empty.'; $wb['error_ns2_empty'] = 'NS2 empty.'; $wb['error_email_empty'] = 'EMail empty.'; ?> interface/web/dns/templates/dns_wizard.htm
@@ -1,6 +1,10 @@ <h2><tmpl_var name="list_head_txt"></h2> <p><tmpl_var name="list_desc_txt"></p> <tmpl_if name="error"> <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div> </tmpl_if> <div class="panel panel_dns_wizard"> <div class="pnl_formsarea"> interface/web/mail/lib/lang/en_spamfilter_blacklist.lng
@@ -5,4 +5,5 @@ $wb["email_txt"] = 'Email'; $wb["priority_txt"] = 'Priority'; $wb["active_txt"] = 'Active'; $wb["limit_spamfilter_wblist_txt"] = 'The max. number of White- or Blacklist records for your account is reached.'; ?> interface/web/mail/lib/lang/en_spamfilter_whitelist.lng
@@ -5,4 +5,5 @@ $wb["email_txt"] = 'Email'; $wb["priority_txt"] = 'Priority'; $wb["active_txt"] = 'Active'; $wb["limit_spamfilter_wblist_txt"] = 'The max. number of White- or Blacklist records for your account is reached.'; ?> interface/web/mail/spamfilter_blacklist_edit.php
@@ -63,7 +63,7 @@ if($client["limit_spamfilter_wblist"] >= 0) { $tmp = $app->db->queryOneRecord("SELECT count(wblist_id) as number FROM spamfilter_wblist WHERE sys_groupid = $client_group_id"); if($tmp["number"] >= $client["limit_spamfilter_wblist"]) { $app->error($app->tform->wordbook["limit_spamfilter_wblist_txt"]); $app->error($app->tform->lng("limit_spamfilter_wblist_txt")); } } } interface/web/mail/spamfilter_whitelist_edit.php
@@ -63,7 +63,7 @@ if($client["limit_spamfilter_wblist"] >= 0) { $tmp = $app->db->queryOneRecord("SELECT count(wblist_id) as number FROM spamfilter_wblist WHERE sys_groupid = $client_group_id"); if($tmp["number"] >= $client["limit_spamfilter_wblist"]) { $app->error($app->tform->wordbook["limit_spamfilter_wblist_txt"]); $app->error($app->tform->lng("limit_spamfilter_wblist_txt")); } } } server/scripts/update_from_tgz.sh
@@ -1,8 +1,15 @@ #!/bin/bash cd /tmp if [ -f ISPConfig-3-stable.tar.gz ] then rm -f ISPConfig-3-stable.tar.gz fi wget http://www.ispconfig.org/downloads/ISPConfig-3-stable.tar.gz tar xvfz ISPConfig-3-stable.tar.gz cd ispconfig3_install/install/ php -q update.php rm -rf /tmp/ispconfig3_install/install rm -f ISPConfig-3-stable.tar.gz
