Commit 9b155852 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

parents 39dd4ecc da837c29
......@@ -22,10 +22,6 @@ Uninstaller
Server
--------------------------------------
- Add a backend plugin to configure network card settings. The IP address
settings are stored in the server_ip table.
-- This works now on Debian and Ubuntu Linux.
Mail module
--------------------------------------
......
......@@ -118,7 +118,7 @@ class installer extends installer_base {
chgrp($config_dir.'/'.$configfile, 'root');
// Dovecot shall ignore mounts in website directory
exec("doveadm mount add '/var/www/*' ignore");
if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
}
......
......@@ -633,6 +633,7 @@ class installer_base {
//* Create aliasaes
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman');
}
......@@ -1007,7 +1008,7 @@ class installer_base {
chgrp($config_dir.'/'.$configfile, 'root');
// Dovecot shall ignore mounts in website directory
exec("doveadm mount add '/var/www/*' ignore");
if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
}
......@@ -2136,6 +2137,13 @@ class installer_base {
//* Remove Domain module as its functions are available in the client module now
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
//* Disable rkhunter run and update in debian cronjob as ispconfig is running and updating rkhunter
if(is_file('/etc/default/rkhunter')) {
replaceLine('/etc/default/rkhunter', 'CRON_DAILY_RUN="yes"', 'CRON_DAILY_RUN="no"', 1, 0);
replaceLine('/etc/default/rkhunter', 'CRON_DB_UPDATE="yes"', 'CRON_DB_UPDATE="no"', 1, 0);
}
}
......
......@@ -29,10 +29,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//* Installer patch stub class
class installer_patch_update {
protected function onBeforeSQL() {
public function onBeforeSQL() {
}
protected function onAfterSQL() {
public function onAfterSQL() {
}
}
......@@ -164,6 +164,9 @@ function updateDbAndIni() {
$next_db_version = intval($current_db_version + 1);
$sql_patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
$php_patch_filename = realpath(dirname(__FILE__).'/../').'/patches/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.php';
// comma separated list of version numbers were a update has to be done silently
$silent_update_versions = '75';
if(is_file($sql_patch_filename)) {
......@@ -186,10 +189,14 @@ function updateDbAndIni() {
//* Load patch file into database
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'])." < ".$sql_patch_filename);
$cmd = "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 {
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);
$cmd = "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;
}
if(in_array($next_db_version,explode(',',$silent_update_versions))) $cmd .= ' > /dev/null 2> /dev/null';
system($cmd);
swriteln($inst->lng('Loading SQL patch file').': '.$sql_patch_filename);
//* Exec onAfterSQL function
......
ALTER TABLE `software_package` ADD `package_remote_functions` TEXT NULL AFTER `package_requires_db`;
ALTER TABLE `client` ADD `customer_no` VARCHAR( 64 ) NULL AFTER `contact_name` , ADD `vat_id` VARCHAR( 64 ) NULL AFTER `customer_no`;
\ No newline at end of file
CREATE TABLE IF NOT EXISTS `dns_slave` (
`id` int(10) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
`sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
`sys_perm_user` varchar(5) NOT NULL DEFAULT '',
`sys_perm_group` varchar(5) NOT NULL DEFAULT '',
`sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL default '1',
`origin` varchar(255) NOT NULL DEFAULT '',
`ns` varchar(255) NOT NULL DEFAULT '',
`active` enum('N','Y') NOT NULL DEFAULT 'N',
`xfer` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`id`),
KEY `origin` (`origin`),
KEY `active` (`active`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
ALTER TABLE `dns_slave` DROP INDEX `origin`;
ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);
\ No newline at end of file
ALTER TABLE `dbispconfig`.`web_domain` ADD UNIQUE `serverdomain` ( `server_id` , `domain` );
ALTER TABLE `web_domain` ADD UNIQUE `serverdomain` ( `server_id` , `domain` );
ALTER TABLE `dns_rr` DROP KEY rr,
CHANGE `name` `name` VARCHAR( 128 ) NOT NULL,
......
......@@ -3,5 +3,4 @@ ALTER TABLE `client`
ALTER TABLE `client_template`
ADD `limit_database_quota` int(11) NOT NULL default '-1' AFTER `limit_database`;
ALTER TABLE `web_database`
ADD `database_quota` int(11) unsigned DEFAULT NULL AFTER `database_name_prefix`,
ADD `last_quota_notification` date NULL default NULL;
ADD `database_quota` int(11) unsigned DEFAULT NULL AFTER `database_name_prefix`;
ALTER TABLE `client_template` ADD `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_webdav_user`;
ALTER TABLE `client` ADD `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_webdav_user`;
ALTER TABLE `web_domain` CHANGE `php_fpm_use_socket` `php_fpm_use_socket` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y';
ALTER TABLE `mail_domain` ADD `dkim_selector` VARCHAR(63) NOT NULL DEFAULT 'default' AFTER `dkim`;
ALTER TABLE `aps_instances`
CHANGE `customer_id` `customer_id` int(4) NOT NULL DEFAULT '0',
CHANGE `package_id` `package_id` int(4) NOT NULL DEFAULT '0',
CHANGE `instance_status` `instance_status` int(4) NOT NULL DEFAULT '0';
ALTER TABLE `aps_instances_settings`
CHANGE `instance_id` `instance_id` int(4) NOT NULL DEFAULT '0',
CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
CHANGE `value` `value` text;
ALTER TABLE `aps_packages`
CHANGE `path` `path` varchar(255) NOT NULL DEFAULT '',
CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
CHANGE `category` `category` varchar(255) NOT NULL DEFAULT '',
CHANGE `version` `version` varchar(20) NOT NULL DEFAULT '',
CHANGE `release` `release` int(4) NOT NULL DEFAULT '0',
CHANGE `package_url` `package_url` TEXT;
ALTER TABLE `aps_settings`
CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
CHANGE `value` `value` text;
ALTER TABLE `attempts_login`
CHANGE `ip` `ip` varchar(39) NOT NULL DEFAULT '';
ALTER TABLE `client`
CHANGE `internet` `internet` varchar(255) NOT NULL DEFAULT '',
CHANGE `mail_servers` `mail_servers` blob,
CHANGE `web_servers` `web_servers` blob,
CHANGE `db_servers` `db_servers` blob,
CHANGE `dns_servers` `dns_servers` blob,
CHANGE `template_additional` `template_additional` text;
ALTER TABLE `client_template`
CHANGE `template_name` `template_name` varchar(64) NOT NULL DEFAULT '';
ALTER TABLE `country`
CHANGE `iso` `iso` char(2) NOT NULL DEFAULT '',
CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
CHANGE `printable_name` `printable_name` varchar(64) NOT NULL DEFAULT '';
ALTER TABLE `cron`
CHANGE `command` `command` TEXT;
ALTER TABLE `dns_rr`
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
CHANGE `zone` `zone` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
CHANGE `data` `data` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `dns_slave`
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
CHANGE `origin` `origin` varchar(255) NOT NULL DEFAULT '',
CHANGE `ns` `ns` varchar(255) NOT NULL DEFAULT '',
CHANGE `active` `active` enum('N','Y') NOT NULL DEFAULT 'N',
CHANGE `xfer` `xfer` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `dns_soa`
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
CHANGE `origin` `origin` varchar(255) NOT NULL DEFAULT '',
CHANGE `ns` `ns` varchar(255) NOT NULL DEFAULT '',
CHANGE `mbox` `mbox` varchar(255) NOT NULL DEFAULT '',
CHANGE `active` `active` enum('N','Y') NOT NULL DEFAULT 'N',
CHANGE `xfer` `xfer` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `mail_access`
CHANGE `source` `source` varchar(255) NOT NULL DEFAULT '',
CHANGE `access` `access` varchar(255) NOT NULL DEFAULT '',
CHANGE `type` `type` set('recipient','sender','client') NOT NULL DEFAULT 'recipient';
ALTER TABLE `mail_backup`
CHANGE `server_id` `server_id` int(10) unsigned NOT NULL DEFAULT '0',
CHANGE `parent_domain_id` `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
CHANGE `mailuser_id` `mailuser_id` int(10) unsigned NOT NULL DEFAULT '0',
CHANGE `tstamp` `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
CHANGE `filename` `filename` varchar(255) NOT NULL DEFAULT '',
CHANGE `filesize` `filesize` VARCHAR(10) NOT NULL DEFAULT '';
ALTER TABLE `mail_domain`
CHANGE `active` `active` enum('n','y') NOT NULL DEFAULT 'n';
ALTER TABLE `mail_forwarding`
CHANGE `source` `source` varchar(255) NOT NULL DEFAULT '',
CHANGE `active` `active` enum('n','y') NOT NULL DEFAULT 'n';
ALTER TABLE `mail_mailinglist`
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
CHANGE `domain` `domain` varchar(255) NOT NULL DEFAULT '',
CHANGE `listname` `listname` varchar(255) NOT NULL DEFAULT '',
CHANGE `email` `email` varchar(255) NOT NULL DEFAULT '',
CHANGE `password` `password` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `mail_traffic`
CHANGE `mailuser_id` `mailuser_id` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `month` `month` char(7) NOT NULL DEFAULT '',
CHANGE `traffic` `traffic` bigint(20) unsigned NOT NULL DEFAULT '0';
ALTER TABLE `mail_transport`
CHANGE `transport` `transport` varchar(255) NOT NULL DEFAULT '',
CHANGE `active` `active` enum('n','y') NOT NULL DEFAULT 'n';
ALTER TABLE `mail_user`
CHANGE `login` `login` varchar(255) NOT NULL default '',
CHANGE `password` `password` varchar(255) NOT NULL default '',
CHANGE `homedir` `homedir` varchar(255) NOT NULL default '',
CHANGE `postfix` `postfix` enum('n','y') NOT NULL default 'y',
CHANGE `access` `access` enum('n','y') NOT NULL default 'y';
ALTER TABLE `monitor_data`
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL default '0',
CHANGE `type` `type` varchar(255) NOT NULL default '',
CHANGE `created` `created` int(11) unsigned NOT NULL default '0',
CHANGE `data` `data` mediumtext;
ALTER TABLE `openvz_ostemplate`
CHANGE `template_file` `template_file` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `openvz_traffic`
CHANGE `veid` `veid` int(11) NOT NULL DEFAULT '0',
CHANGE `traffic_date` `traffic_date` date NOT NULL DEFAULT '0000-00-00';
ALTER TABLE `openvz_vm`
CHANGE `veid` `veid` int(10) unsigned NOT NULL DEFAULT '0',
CHANGE `ip_address` `ip_address` varchar(255) NOT NULL DEFAULT '',
CHANGE `active_until_date` `active_until_date` date NOT NULL DEFAULT '0000-00-00',
CHANGE `capability` `capability` text,
CHANGE `config` `config` mediumtext;
ALTER TABLE `remote_session`
CHANGE `remote_session` `remote_session` varchar(64) NOT NULL DEFAULT '',
CHANGE `remote_userid` `remote_userid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `remote_functions` `remote_functions` text,
CHANGE `tstamp` `tstamp` int(10) unsigned NOT NULL DEFAULT '0';
ALTER TABLE `remote_user`
CHANGE `remote_username` `remote_username` varchar(64) NOT NULL DEFAULT '',
CHANGE `remote_password` `remote_password` varchar(64) NOT NULL DEFAULT '',
CHANGE `remote_functions` `remote_functions` text;
ALTER TABLE `server`
CHANGE `config` `config` text;
ALTER TABLE `shell_user`
CHANGE `chroot` `chroot` varchar(255) NOT NULL DEFAULT '',
CHANGE `ssh_rsa` `ssh_rsa` text;
ALTER TABLE `software_update`
CHANGE `software_repo_id` `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `package_name` `package_name` varchar(64) NOT NULL DEFAULT '',
CHANGE `update_url` `update_url` varchar(255) NOT NULL DEFAULT '',
CHANGE `update_md5` `update_md5` varchar(255) NOT NULL DEFAULT '',
CHANGE `update_dependencies` `update_dependencies` varchar(255) NOT NULL DEFAULT '',
CHANGE `update_title` `update_title` varchar(64) NOT NULL DEFAULT '';
ALTER TABLE `software_update_inst`
CHANGE `package_name` `package_name` varchar(64) NOT NULL DEFAULT '',
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0';
ALTER TABLE `spamfilter_policy`
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '';
ALTER TABLE `spamfilter_users`
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `email` `email` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `spamfilter_wblist`
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `rid` `rid` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `email` `email` varchar(255) NOT NULL DEFAULT '',
CHANGE `priority` `priority` tinyint(3) unsigned NOT NULL DEFAULT '0';
ALTER TABLE `sys_config`
CHANGE `group` `group` varchar(64) NOT NULL DEFAULT '',
CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
CHANGE `value` `value` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `sys_cron`
CHANGE `name` `name` varchar(50) NOT NULL DEFAULT '';
ALTER TABLE `sys_datalog`
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `data` `data` longtext;
ALTER TABLE `sys_group`
CHANGE `description` `description` text;
ALTER TABLE `sys_ini`
CHANGE `config` `config` longtext;
ALTER TABLE `sys_log`
CHANGE `tstamp` `tstamp` int(11) unsigned NOT NULL DEFAULT '0';
ALTER TABLE `sys_remoteaction`
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
CHANGE `tstamp` `tstamp` int(11) NOT NULL DEFAULT '0',
CHANGE `action_type` `action_type` varchar(20) NOT NULL DEFAULT '',
CHANGE `action_param` `action_param` mediumtext,
CHANGE `action_state` `action_state` enum('pending','ok','warning','error') NOT NULL DEFAULT 'pending',
CHANGE `response` `response` mediumtext;
ALTER TABLE `sys_theme`
CHANGE `tpl_name` `tpl_name` varchar(32) NOT NULL DEFAULT '',
CHANGE `username` `username` varchar(64) NOT NULL DEFAULT '',
CHANGE `logo_url` `logo_url` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `sys_user`
CHANGE `groups` `groups` TEXT;
ALTER TABLE `web_backup`
CHANGE `server_id` `server_id` int(10) unsigned NOT NULL DEFAULT '0',
CHANGE `parent_domain_id` `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
CHANGE `tstamp` `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
CHANGE `filename` `filename` varchar(255) NOT NULL DEFAULT '',
CHANGE `filesize` `filesize` VARCHAR(10) NOT NULL DEFAULT '';
ALTER TABLE `web_database`
CHANGE `remote_ips` `remote_ips` text;
ALTER TABLE `web_traffic`
CHANGE `hostname` `hostname` varchar(255) NOT NULL DEFAULT '',
CHANGE `traffic_date` `traffic_date` date NOT NULL DEFAULT '0000-00-00';
ALTER TABLE `web_database` ADD `last_quota_notification` date NULL default NULL AFTER `database_quota`;
ALTER TABLE `ftp_user` CHANGE `username_prefix` `username_prefix` varchar(50) NOT NULL DEFAULT '';
ALTER TABLE `mail_domain` CHANGE `dkim` `dkim` enum('n','y') NOT NULL DEFAULT 'n';
ALTER TABLE `mail_forwarding` CHANGE `destination` `destination` text;
ALTER TABLE `mail_user`
CHANGE `uid` `uid` int(11) unsigned NOT NULL DEFAULT '5000',
CHANGE `gid` `gid` int(11) unsigned NOT NULL DEFAULT '5000';
ALTER TABLE `server`
CHANGE `proxy_server` `proxy_server` tinyint(1) NOT NULL DEFAULT '0',
CHANGE `firewall_server` `firewall_server` tinyint(1) NOT NULL DEFAULT '0',
CHANGE `dbversion` `dbversion` int(11) unsigned NOT NULL DEFAULT '1';
ALTER TABLE `server_ip`
CHANGE `virtualhost_port` `virtualhost_port` varchar(255) DEFAULT '80,443';
ALTER TABLE `shell_user`
CHANGE `username_prefix` `username_prefix` varchar(50) NOT NULL DEFAULT '';
ALTER TABLE `client` ADD `limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1' AFTER `default_slave_dnsserver`;
ALTER TABLE `client_template` ADD `limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1' AFTER `limit_dns_zone`;
ALTER TABLE `client`
CHANGE `id_rsa` `id_rsa` varchar(2000) NOT NULL DEFAULT '',
CHANGE `ssh_rsa` `ssh_rsa` varchar(600) NOT NULL DEFAULT '';
ALTER TABLE `software_package` CHANGE `software_repo_id` `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0';
ALTER TABLE `software_package` ADD `package_installable` enum('yes','no','key') NOT NULL default 'yes' AFTER `package_type`;
ALTER TABLE `software_package` ADD `package_requires_db` enum('no','mysql') NOT NULL default 'no' AFTER `package_installable`;
ALTER TABLE `software_package` ADD `package_remote_functions` TEXT NULL AFTER `package_requires_db`;
ALTER TABLE `software_package` ADD `package_key` varchar(255) NOT NULL DEFAULT '' AFTER `package_remote_functions`;
ALTER TABLE `software_package` ADD `package_config` text AFTER `package_key`;
ALTER TABLE `software_package`
CHANGE `package_name` `package_name` varchar(64) NOT NULL DEFAULT '',
CHANGE `package_title` `package_title` varchar(64) NOT NULL DEFAULT '',
CHANGE `package_key` `package_key` varchar(255) NOT NULL DEFAULT '';
INSERT IGNORE INTO `sys_config` (`group`, `name`, `value`) VALUES ('interface', 'session_timeout', '0');
ALTER TABLE `sys_datalog` CHANGE `status` `status` set('pending','ok','warning','error') NOT NULL DEFAULT 'ok';
ALTER TABLE `sys_session` CHANGE `session_id` `session_id` varchar(64) NOT NULL DEFAULT '';
ALTER TABLE `sys_user` CHANGE `language` `language` varchar(2) NOT NULL DEFAULT 'en';
ALTER TABLE `sys_user`
ADD `id_rsa` varchar(2000) NOT NULL DEFAULT '' AFTER `client_id`,
ADD `ssh_rsa` varchar(600) NOT NULL DEFAULT '' AFTER `id_rsa`;
ALTER TABLE `webdav_user` CHANGE `username_prefix` `username_prefix` varchar(50) NOT NULL DEFAULT '';
ALTER TABLE `web_database` CHANGE `database_name_prefix` `database_name_prefix` varchar(50) NOT NULL DEFAULT '';
ALTER TABLE `web_database_user` CHANGE `database_user_prefix` `database_user_prefix` varchar(50) NOT NULL DEFAULT '';
ALTER TABLE `web_domain` DROP COLUMN `document_root_www`;
ALTER TABLE `web_domain`
CHANGE `ssl_key` `ssl_key` mediumtext,
CHANGE `apache_directives` `apache_directives` mediumtext,
CHANGE `php_open_basedir` `php_open_basedir` mediumtext,
CHANGE `custom_php_ini` `custom_php_ini` mediumtext;
CREATE TABLE IF NOT EXISTS `dns_slave` (
`id` int(10) unsigned NOT NULL auto_increment,
`sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
`sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
`sys_perm_user` varchar(5) NOT NULL DEFAULT '',
`sys_perm_group` varchar(5) NOT NULL DEFAULT '',
`sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL default '1',
`origin` varchar(255) NOT NULL DEFAULT '',
`ns` varchar(255) NOT NULL DEFAULT '',
`active` enum('N','Y') NOT NULL DEFAULT 'N',
`xfer` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`id`),
UNIQUE KEY `slave` (`origin`,`server_id`),
KEY `active` (`active`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
This diff is collapsed.
......@@ -51,6 +51,7 @@ protocol pop3 {
}
protocol lda {
mail_plugins = sieve quota
postmaster_address = root@localhost
}
protocol lmtp {
postmaster_address = webmaster@localhost
......
......@@ -593,6 +593,11 @@ class ispcmail {
$response = fgets($this->_smtp_conn, 515);
if(empty($this->_smtp_conn)) return false;
//Say Hello to SMTP
if($this->smtp_helo == '') $this->detectHelo();
fputs($this->_smtp_conn, 'HELO ' . $this->smtp_helo . $this->_crlf);
$response = fgets($this->_smtp_conn, 515);
// ENCRYPTED?
if($this->smtp_crypt == 'tls') {
fputs($this->_smtp_conn, 'STARTTLS' . $this->_crlf);
......@@ -600,11 +605,6 @@ class ispcmail {
stream_socket_enable_crypto($this->_smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
}
//Say Hello to SMTP
if($this->smtp_helo == '') $this->detectHelo();
fputs($this->_smtp_conn, 'HELO ' . $this->smtp_helo . $this->_crlf);
$response = fgets($this->_smtp_conn, 515);
//AUTH LOGIN
fputs($this->_smtp_conn, 'AUTH LOGIN' . $this->_crlf);
$response = fgets($this->_smtp_conn, 515);
......
......@@ -69,70 +69,70 @@ $wb['monthnamesshort_oct'] = 'Οκτ';
$wb['monthnamesshort_nov'] = 'Νοε';
$wb['monthnamesshort_dec'] = 'Δεκ';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['logout_txt'] = 'Αποσύνδεση';
$wb['submit_confirmation'] = 'Είστε σίγουροι ότι θέλετε να κάνετε αυτή την ενέργεια?';
$wb['logout_txt'] = 'Logout';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
$wb['top_menu_mailuser'] = 'Mailuser';
$wb['globalsearch_resultslimit_of_txt'] = 'από';
$wb['globalsearch_resultslimit_results_txt'] = 'αποτελέσματα';
$wb['globalsearch_noresults_text_txt'] = 'Δεν υπάρχουν αποτελέσματα.';
$wb['globalsearch_noresults_limit_txt'] = '0 αποτελέσματα';
$wb['globalsearch_searchfield_watermark_txt'] = 'Αναζήτηση';
$wb['globalsearch_suggestions_text_txt'] = 'Προτάσεις';
$wb['global_tabchange_warning_txt'] = 'Τα τροποποιημένα δεδομένα σε αυτή την καρτέλα θα αλλάξουν οριστικά αν πατήσετε ΟΚ. Πατήσετε Άκυρο για να μην συμβεί αυτό..';
$wb['global_tabchange_discard_txt'] = 'Έχετε μη αποθηκευμένες αλλαγές σε αυτή την καρτέλα. Οι αλλαγές θα χαθούν αν συνεχίσετε.';
$wb['datalog_changes_txt'] = 'Οι επόμενες αλλαγές δεν έχουν προωθηθεί στους servers:';
$wb['datalog_changes_end_txt'] = 'Η αποθήκευση των ενημερώσεων μπορεί να διαρκέσει μεχρι και ένα λεπτό. Παρακαλούμε να είστε υπομονετικοί.';
$wb['datalog_status_i_web_database'] = 'Δημιουργία νέας Βάσης Δεδομένων (ΒΔ)';
$wb['datalog_status_u_web_database'] = 'Ενημέρωση Βάσης Δεδομένων';
$wb['datalog_status_d_web_database'] = 'Διαγραφή Βάσης Δεδομένων';
$wb['datalog_status_i_web_database_user'] = 'Δημιουργία χρήστη για την Βάση Δεδομένων';
$wb['datalog_status_u_web_database_user'] = 'Ενημέρωση χρήστη Βάσης Δεδομένων';
$wb['datalog_status_d_web_database_user'] = 'Διαγραφή χρήστη Βάσης Δεδομένων';
$wb['datalog_status_i_web_domain'] = 'Δημιουργία νέου website';
$wb['datalog_status_u_web_domain'] = 'Ενημέρωση ρυθμίσεων website';
$wb['datalog_status_d_web_domain'] = 'Διαγραφή website';
$wb['datalog_status_i_ftp_user'] = 'Δημιουργία χρήστη FTP';
$wb['datalog_status_u_ftp_user'] = 'Ενημέρωση FTP user';
$wb['datalog_status_d_ftp_user'] = 'Διαγραφή FTP user';
$wb['datalog_status_i_mail_domain'] = 'Δημιουργία email domain';
$wb['datalog_status_u_mail_domain'] = 'Ενημέρωση email domain';
$wb['datalog_status_d_mail_domain'] = 'Διαγραφή email domain';
$wb['datalog_status_i_mail_user'] = 'Δημιουργία χρήστη email';
$wb['datalog_status_u_mail_user'] = 'Ενημέρωση χρήστη email';
$wb['datalog_status_d_mail_user'] = 'Διαγραφή χρήστη email';
$wb['datalog_status_i_mail_forwarding'] = 'Δημιουργία διεύθυνσης email';
$wb['datalog_status_u_mail_forwarding'] = 'Ενημέρωση διεύθυνσης email';
$wb['datalog_status_d_mail_forwarding'] = 'Διαγραφή διεύθυνσης email';
$wb['datalog_status_i_dns_rr'] = 'Δημιουργία εγγραφής DNS';
$wb['datalog_status_u_dns_rr'] = 'Ενημέρωση εγγραφής DNS';
$wb['datalog_status_d_dns_rr'] = 'Διαγραφή εγγραφής DNS';
$wb['datalog_status_i_dns_soa'] = 'Δημιουργία ζώνης DNS';
$wb['datalog_status_u_dns_soa'] = 'Ενημέρωση ζώνης DNS';
$wb['datalog_status_d_dns_soa'] = 'Διαγραφή ζώνης DNS';
$wb['datalog_status_i_cron'] = 'Δημιουργία εργασίας cron';
$wb['datalog_status_u_cron'] = 'Ενημέρωση εργασίας cron';
$wb['datalog_status_d_cron'] = 'Διαγραφή εργασίας cron';
$wb['datalog_status_i_mail_get'] = 'Δημιουργία δημιουργία λογαριασμού mail fetcher';
$wb['datalog_status_u_mail_get'] = 'Ενημέρωση δημιουργία λογαριασμού mail fetcher';
$wb['datalog_status_d_mail_get'] = 'Διαγραφή δημιουργία λογαριασμού mail fetcher';
$wb['datalog_status_i_mail_mailinglist'] = 'Δημιουργία λίστας mail';
$wb['datalog_status_u_mail_mailinglist'] = 'Ενημέρωση λίστας mail';
$wb['datalog_status_d_mail_mailinglist'] = 'Διαγραφή λίστας mail';
$wb['datalog_status_i_shell_user'] = 'Δημιουργία χρήστη shell';
$wb['datalog_status_u_shell_user'] = 'Ενημέρωση χρήστη shell';
$wb['datalog_status_d_shell_user'] = 'Διαγραφή χρήστη shell';
$wb['datalog_status_i_web_folder'] = 'Δημιουργία προστασίας φακέλου';
$wb['datalog_status_u_web_folder'] = 'Ενημέρωση προστασίας φακέλου';
$wb['datalog_status_d_web_folder'] = 'Διαγραφή προστασίας φακέλου';
$wb['datalog_status_i_web_folder_user'] = 'Δημιουργία χρήστη προστασίας φακέλου';
$wb['datalog_status_u_web_folder_user'] = 'Ενημέρωση χρήστη προστασίας φακέλου';
$wb['datalog_status_d_web_folder_user'] = 'Διαγραφή χρήστη προστασίας φακέλου';
$wb['datalog_status_i_spamfilter_users'] = 'Δημιουργία ρυθμίσεων φίλτρου spam';
$wb['datalog_status_u_spamfilter_users'] = 'Ενημέρωση ρυθμίσεων φίλτρου spam';