Commit 992797f7 authored by Marius Cramer's avatar Marius Cramer

Copied files from svn 3.0.5 stable branch (git migration)

parent 7b47c0aa
...@@ -285,7 +285,7 @@ $inst->configure_dbserver(); ...@@ -285,7 +285,7 @@ $inst->configure_dbserver();
//if(@is_dir('/etc/Bastille')) { //if(@is_dir('/etc/Bastille')) {
//* Configure Firewall //* Configure Firewall
swriteln('Configuring Firewall'); swriteln('Configuring Firewall');
$inst->configure_bastille_firewall(); $inst->configure_firewall();
//} //}
//** Configure ISPConfig //** Configure ISPConfig
......
...@@ -845,6 +845,7 @@ class installer_dist extends installer_base { ...@@ -845,6 +845,7 @@ class installer_dist extends installer_base {
$content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content); $content = str_replace('{theme}', $conf['theme'], $content);
$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);
wf("$install_dir/interface/lib/$configfile", $content); wf("$install_dir/interface/lib/$configfile", $content);
...@@ -869,6 +870,7 @@ class installer_dist extends installer_base { ...@@ -869,6 +870,7 @@ class installer_dist extends installer_base {
$content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content); $content = str_replace('{theme}', $conf['theme'], $content);
$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);
wf("$install_dir/server/lib/$configfile", $content); wf("$install_dir/server/lib/$configfile", $content);
......
...@@ -725,6 +725,7 @@ class installer extends installer_base ...@@ -725,6 +725,7 @@ class installer extends installer_base
$content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content); $content = str_replace('{theme}', $conf['theme'], $content);
$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);
$this->write_config_file("$install_dir/interface/lib/$configfile", $content); $this->write_config_file("$install_dir/interface/lib/$configfile", $content);
......
...@@ -900,6 +900,7 @@ class installer_dist extends installer_base { ...@@ -900,6 +900,7 @@ class installer_dist extends installer_base {
$content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content); $content = str_replace('{theme}', $conf['theme'], $content);
$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);
wf("$install_dir/interface/lib/$configfile", $content); wf("$install_dir/interface/lib/$configfile", $content);
...@@ -924,6 +925,7 @@ class installer_dist extends installer_base { ...@@ -924,6 +925,7 @@ class installer_dist extends installer_base {
$content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content); $content = str_replace('{theme}', $conf['theme'], $content);
$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);
wf("$install_dir/server/lib/$configfile", $content); wf("$install_dir/server/lib/$configfile", $content);
......
...@@ -34,6 +34,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -34,6 +34,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
error_reporting(E_ALL|E_STRICT); error_reporting(E_ALL|E_STRICT);
define('INSTALLER_RUN', true);
//** The banner on the command line //** The banner on the command line
echo "\n\n".str_repeat('-',80)."\n"; echo "\n\n".str_repeat('-',80)."\n";
echo " _____ ___________ _____ __ _ ____ echo " _____ ___________ _____ __ _ ____
...@@ -106,8 +108,9 @@ $inst->find_installed_apps(); ...@@ -106,8 +108,9 @@ $inst->find_installed_apps();
$conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en'); $conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en');
$conf['timezone'] = get_system_timezone(); $conf['timezone'] = get_system_timezone();
//* Set defaukt theme //* Set default theme
$conf['theme'] = 'default'; $conf['theme'] = 'default';
$conf['language_file_import_enabled'] = true;
//** Select installation mode //** Select installation mode
$install_mode = $inst->simple_query('Installation mode', array('standard','expert'), 'standard'); $install_mode = $inst->simple_query('Installation mode', array('standard','expert'), 'standard');
...@@ -257,17 +260,10 @@ if($install_mode == 'standard') { ...@@ -257,17 +260,10 @@ if($install_mode == 'standard') {
$inst->configure_apps_vhost(); $inst->configure_apps_vhost();
//* Configure Firewall //* Configure Firewall
if($conf['ufw']['installed'] == true) {
//* Configure Ubuntu Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Ubuntu Firewall');
$inst->configure_ufw_firewall();
} else {
//* Configure Bastille Firewall //* Configure Bastille Firewall
$conf['services']['firewall'] = true; $conf['services']['firewall'] = true;
swriteln('Configuring Bastille Firewall'); swriteln('Configuring Bastille Firewall');
$inst->configure_bastille_firewall(); $inst->configure_firewall();
}
//* Configure Fail2ban //* Configure Fail2ban
if($conf['fail2ban']['installed'] == true) { if($conf['fail2ban']['installed'] == true) {
...@@ -335,7 +331,7 @@ if($install_mode == 'standard') { ...@@ -335,7 +331,7 @@ if($install_mode == 'standard') {
if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null'); if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
//if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null'); //if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null'); if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null'); //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
}else{ }else{
//* In expert mode, we select the services in the following steps, only db is always available //* In expert mode, we select the services in the following steps, only db is always available
...@@ -551,17 +547,18 @@ if($install_mode == 'standard') { ...@@ -551,17 +547,18 @@ if($install_mode == 'standard') {
//** Configure Firewall //** Configure Firewall
if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') { if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {
if($conf['ufw']['installed'] == true) { //if($conf['bastille']['installed'] == true) {
//* Configure Bastille Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Bastille Firewall');
$inst->configure_firewall();
/*} elseif($conf['ufw']['installed'] == true) {
//* Configure Ubuntu Firewall //* Configure Ubuntu Firewall
$conf['services']['firewall'] = true; $conf['services']['firewall'] = true;
swriteln('Configuring Ubuntu Firewall'); swriteln('Configuring Ubuntu Firewall');
$inst->configure_ufw_firewall(); $inst->configure_ufw_firewall();
} else {
//* Configure Bastille Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Bastille Firewall');
$inst->configure_bastille_firewall();
} }
*/
} }
//** Configure Firewall //** Configure Firewall
......
...@@ -132,7 +132,7 @@ class installer_base { ...@@ -132,7 +132,7 @@ class installer_base {
if(is_installed('named') || is_installed('bind') || is_installed('bind9')) $conf['bind']['installed'] = true; if(is_installed('named') || is_installed('bind') || is_installed('bind9')) $conf['bind']['installed'] = true;
if(is_installed('squid')) $conf['squid']['installed'] = true; if(is_installed('squid')) $conf['squid']['installed'] = true;
if(is_installed('nginx')) $conf['nginx']['installed'] = true; if(is_installed('nginx')) $conf['nginx']['installed'] = true;
if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true; // if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true;
if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true; if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true;
if(is_installed('vzctl')) $conf['openvz']['installed'] = true; if(is_installed('vzctl')) $conf['openvz']['installed'] = true;
if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true; if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true;
...@@ -1365,6 +1365,7 @@ class installer_base { ...@@ -1365,6 +1365,7 @@ class installer_base {
exec('chown root:root '.$conf["squid"]["config_dir"].'/'.$configfile); exec('chown root:root '.$conf["squid"]["config_dir"].'/'.$configfile);
} }
/*
public function configure_ufw_firewall() public function configure_ufw_firewall()
{ {
$configfile = 'ufw.conf'; $configfile = 'ufw.conf';
...@@ -1374,8 +1375,9 @@ class installer_base { ...@@ -1374,8 +1375,9 @@ class installer_base {
exec('chmod 600 /etc/ufw/ufw.conf'); exec('chmod 600 /etc/ufw/ufw.conf');
exec('chown root:root /etc/ufw/ufw.conf'); exec('chown root:root /etc/ufw/ufw.conf');
} }
*/
public function configure_bastille_firewall() { public function configure_firewall() {
global $conf; global $conf;
$dist_init_scripts = $conf['init_scripts']; $dist_init_scripts = $conf['init_scripts'];
...@@ -1691,6 +1693,7 @@ class installer_base { ...@@ -1691,6 +1693,7 @@ class installer_base {
$content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content); $content = str_replace('{theme}', $conf['theme'], $content);
$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);
wf($install_dir.'/interface/lib/'.$configfile, $content); wf($install_dir.'/interface/lib/'.$configfile, $content);
...@@ -1715,6 +1718,7 @@ class installer_base { ...@@ -1715,6 +1718,7 @@ class installer_base {
$content = str_replace('{language}', $conf['language'], $content); $content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content); $content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content); $content = str_replace('{theme}', $conf['theme'], $content);
$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);
wf($install_dir.'/server/lib/'.$configfile, $content); wf($install_dir.'/server/lib/'.$configfile, $content);
......
...@@ -27,6 +27,15 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, ...@@ -27,6 +27,15 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
//* Installer patch stub class
class installer_patch_update {
protected function onBeforeSQL() {
}
protected function onAfterSQL() {
}
}
//* DB dump function
function prepareDBDump() { function prepareDBDump() {
global $conf; global $conf;
...@@ -151,16 +160,43 @@ function updateDbAndIni() { ...@@ -151,16 +160,43 @@ function updateDbAndIni() {
$found = true; $found = true;
while($found == true) { while($found == true) {
$next_db_version = intval($current_db_version + 1); $next_db_version = intval($current_db_version + 1);
$patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql'; $sql_patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
if(is_file($patch_filename)) { $php_patch_filename = realpath(dirname(__FILE__).'/../').'/patches/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.php';
if(is_file($sql_patch_filename)) {
//* Load php patch file and instantiate object
if(is_file($php_patch_filename)) {
$php_patch_class_name = 'upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT);
include_once($php_patch_filename);
if(class_exists($php_patch_class_name)) {
$php_patch = new $php_patch_class_name;
} else {
swriteln($inst->lng('WARNING: PHP patch file').': '.$php_patch_filename.' '.$inst->lng('contains errors.'));
}
}
//* Exec onBeforeSQL function
if(isset($php_patch) && is_object($php_patch)) {
$php_patch->onBeforeSQL();
swriteln($inst->lng('Executing PHP patch file').': '.$php_patch_filename);
}
//* Load patch file into database //* Load patch file into database
if( !empty($conf["mysql"]["admin_password"]) ) { if( !empty($conf["mysql"]["admin_password"]) ) {
system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$patch_filename); system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." -p".escapeshellarg($conf['mysql']['admin_password'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename);
} else { } else {
system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$patch_filename); system("mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename);
} }
swriteln($inst->lng('Loading SQL patch file').': '.$patch_filename); swriteln($inst->lng('Loading SQL patch file').': '.$sql_patch_filename);
//* Exec onAfterSQL function
if(isset($php_patch) && is_object($php_patch)) {
$php_patch->onAfterSQL();
}
$current_db_version = $next_db_version; $current_db_version = $next_db_version;
if(isset($php_patch)) unset($php_patch);
} else { } else {
$found = false; $found = false;
} }
...@@ -332,4 +368,6 @@ function updateDbAndIni() { ...@@ -332,4 +368,6 @@ function updateDbAndIni() {
unset($new_ini); unset($new_ini);
} }
?> ?>
<?php
if(!defined('INSTALLER_RUN')) die('Patch update file access violation.');
/*
Example installer patch update class. the classname must match
the php and the sql patch update filename. The php patches are
only executed when a corresponding sql patch exists.
*/
class upd_0001 extends installer_patch_update {
public function onBeforeSQL() {
// Do something
}
public function onAfterSQL() {
// Do something
}
}
?>
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1'; ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
ALTER TABLE `web_backup` ADD `filesize` VARCHAR(10) NOT NULL AFTER `filename`;
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
ALTER TABLE `mail_domain` ADD `dkim_public` MEDIUMTEXT NOT NULL AFTER `domain`;
ALTER TABLE `mail_domain` ADD `dkim_private` MEDIUMTEXT NOT NULL AFTER `domain`;
ALTER TABLE `mail_domain` ADD `dkim` ENUM( 'n', 'y' ) NOT NULL AFTER `domain`;
ALTER TABLE `client` ADD `default_slave_dnsserver` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `limit_dns_zone`; ALTER TABLE `client` ADD `default_slave_dnsserver` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `limit_dns_zone`;
\ No newline at end of file
ALTER TABLE `web_backup` CHANGE `backup_type` `backup_type` enum('web','mongodb','mysql') NOT NULL DEFAULT 'web';
ALTER TABLE `web_database_user` ADD `database_password_mongo` varchar(32) DEFAULT NULL AFTER `database_password`;
ALTER TABLE `sys_datalog` ADD `error` MEDIUMTEXT NULL DEFAULT NULL; ALTER TABLE `sys_datalog` ADD `error` MEDIUMTEXT NULL DEFAULT NULL;
\ No newline at end of file
CREATE TABLE IF NOT EXISTS `sys_cron` (
`name` varchar(50) NOT NULL,
`last_run` datetime NULL DEFAULT NULL,
`next_run` datetime NULL DEFAULT NULL,
`running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
PRIMARY KEY (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
ALTER TABLE `client` ADD COLUMN `can_use_api` enum('n','y') NOT NULL DEFAULT 'n' AFTER `canceled`;
ALTER TABLE `remote_session` ADD COLUMN `client_login` tinyint(1) unsigned NOT NULL default '0' AFTER `remote_functions`;
...@@ -228,6 +228,7 @@ CREATE TABLE `client` ( ...@@ -228,6 +228,7 @@ CREATE TABLE `client` (
`created_at` bigint(20) DEFAULT NULL, `created_at` bigint(20) DEFAULT NULL,
`locked` enum('n','y') NOT NULL DEFAULT 'n', `locked` enum('n','y') NOT NULL DEFAULT 'n',
`canceled` enum('n','y') NOT NULL DEFAULT 'n', `canceled` enum('n','y') NOT NULL DEFAULT 'n',
`can_use_api` enum('n','y') NOT NULL DEFAULT 'n',
`tmp_data` mediumblob, `tmp_data` mediumblob,
`id_rsa` varchar(2000) NOT NULL DEFAULT '', `id_rsa` varchar(2000) NOT NULL DEFAULT '',
`ssh_rsa` varchar(600) NOT NULL DEFAULT '', `ssh_rsa` varchar(600) NOT NULL DEFAULT '',
...@@ -681,9 +682,6 @@ CREATE TABLE `mail_domain` ( ...@@ -681,9 +682,6 @@ CREATE TABLE `mail_domain` (
`sys_perm_other` varchar(5) NOT NULL default '', `sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0', `server_id` int(11) unsigned NOT NULL default '0',
`domain` varchar(255) NOT NULL default '', `domain` varchar(255) NOT NULL default '',
`dkim` ENUM( 'n', 'y' ) NOT NULL default 'n',
`dkim_private` mediumtext NOT NULL default '',
`dkim_public` mediumtext NOT NULL default '',
`active` enum('n','y') NOT NULL, `active` enum('n','y') NOT NULL,
PRIMARY KEY (`domain_id`), PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`), KEY `server_id` (`server_id`,`domain`),
...@@ -1086,6 +1084,7 @@ CREATE TABLE `remote_session` ( ...@@ -1086,6 +1084,7 @@ CREATE TABLE `remote_session` (
`remote_session` varchar(64) NOT NULL, `remote_session` varchar(64) NOT NULL,
`remote_userid` int(11) unsigned NOT NULL, `remote_userid` int(11) unsigned NOT NULL,
`remote_functions` text NOT NULL, `remote_functions` text NOT NULL,
`client_login` tinyint(1) unsigned NOT NULL default '0',
`tstamp` int(10) unsigned NOT NULL, `tstamp` int(10) unsigned NOT NULL,
PRIMARY KEY (`remote_session`) PRIMARY KEY (`remote_session`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
...@@ -1429,6 +1428,21 @@ CREATE TABLE `sys_config` ( ...@@ -1429,6 +1428,21 @@ CREATE TABLE `sys_config` (
`value` varchar(255) NOT NULL `value` varchar(255) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
-- Table structure for table `sys_cron`
--
CREATE TABLE IF NOT EXISTS `sys_cron` (
`name` varchar(50) NOT NULL,
`last_run` datetime NULL DEFAULT NULL,
`next_run` datetime NULL DEFAULT NULL,
`running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
PRIMARY KEY (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- -------------------------------------------------------- -- --------------------------------------------------------
-- --
...@@ -1650,11 +1664,10 @@ CREATE TABLE `web_backup` ( ...@@ -1650,11 +1664,10 @@ CREATE TABLE `web_backup` (
`backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`parent_domain_id` int(10) unsigned NOT NULL, `parent_domain_id` int(10) unsigned NOT NULL,
`backup_type` enum('web','mongodb','mysql') NOT NULL DEFAULT 'web', `backup_type` enum('web','mysql') NOT NULL DEFAULT 'web',
`backup_mode` varchar(64) NOT NULL DEFAULT '', `backup_mode` varchar(64) NOT NULL DEFAULT '',
`tstamp` int(10) unsigned NOT NULL, `tstamp` int(10) unsigned NOT NULL,
`filename` varchar(255) NOT NULL, `filename` varchar(255) NOT NULL,
`filesize` VARCHAR(10) NOT NULL,
PRIMARY KEY (`backup_id`) PRIMARY KEY (`backup_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
...@@ -1706,7 +1719,6 @@ CREATE TABLE IF NOT EXISTS `web_database_user` ( ...@@ -1706,7 +1719,6 @@ CREATE TABLE IF NOT EXISTS `web_database_user` (
`database_user` varchar(64) DEFAULT NULL, `database_user` varchar(64) DEFAULT NULL,
`database_user_prefix` varchar(50) NOT NULL default '', `database_user_prefix` varchar(50) NOT NULL default '',
`database_password` varchar(64) DEFAULT NULL, `database_password` varchar(64) DEFAULT NULL,
`database_password_mongo` varchar(32) DEFAULT NULL,
PRIMARY KEY (`database_user_id`) PRIMARY KEY (`database_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
......
...@@ -75,12 +75,6 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log) ...@@ -75,12 +75,6 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
# Set the log_level to 5 for debugging # Set the log_level to 5 for debugging
$log_level = 0; # (defaults to 0) $log_level = 0; # (defaults to 0)
# DKIM
$enable_dkim_verification = 1;
$enable_dkim_signing = 1; # load DKIM signing code,
@dkim_signature_options_bysender_maps = (
{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
#------------ Do not modify anything below this line ------------- #------------ Do not modify anything below this line -------------
1; # insure a defined return 1; # insure a defined return
...@@ -148,9 +148,11 @@ $conf['theme'] = '{theme}'; ...@@ -148,9 +148,11 @@ $conf['theme'] = '{theme}';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ... $conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf['logo'] = 'themes/default/images/header_logo.png'; $conf['logo'] = 'themes/default/images/header_logo.png';
//** Default Language and Timezone //** Default Language and Timezone
$conf['language'] = '{language}'; $conf['language'] = '{language}';
$conf['debug_language'] = false; $conf['debug_language'] = false;
$conf['language_file_import_enabled'] = {language_file_import_enabled}; // Bool value: true / false
//* Complete timezone list: http://php.net/manual/en/timezones.php //* Complete timezone list: http://php.net/manual/en/timezones.php
$conf['timezone'] = '{timezone}'; $conf['timezone'] = '{timezone}';
......
...@@ -778,11 +778,5 @@ $spam_admin = undef; ...@@ -778,11 +778,5 @@ $spam_admin = undef;
$DO_SYSLOG = 1; $DO_SYSLOG = 1;
$LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log) $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
# DKIM
$enable_dkim_verification = 1;
$enable_dkim_signing = 1; # load DKIM signing code,
@dkim_signature_options_bysender_maps = (
{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
1; # insure a defined return 1; # insure a defined return
...@@ -8,7 +8,6 @@ dnsserver=mydns ...@@ -8,7 +8,6 @@ dnsserver=mydns
auto_network_configuration=n auto_network_configuration=n
ip_address=0.0.0.0 ip_address=0.0.0.0
netmask=255.255.255.0 netmask=255.255.255.0
v6_prefix=
gateway=0.0.0.0 gateway=0.0.0.0
hostname=server1.domain.tld hostname=server1.domain.tld
nameservers=8.8.8.8,8.8.4.4 nameservers=8.8.8.8,8.8.4.4
...@@ -28,7 +27,6 @@ munin_password= ...@@ -28,7 +27,6 @@ munin_password=
module=postfix_mysql module=postfix_mysql
maildir_path=/var/vmail/[domain]/[localpart] maildir_path=/var/vmail/[domain]/[localpart]
homedir_path=/var/vmail homedir_path=/var/vmail