Skip to content

Commit 9b15585

Browse files
author
Till Brehm
committed
Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
2 parents 39dd4ec + da837c2 commit 9b15585

File tree

360 files changed

+2581
-1746
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

360 files changed

+2581
-1746
lines changed

‎TODO.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ Uninstaller
2222
Server
2323
--------------------------------------
2424

25-
- Add a backend plugin to configure network card settings. The IP address
26-
settings are stored in the server_ip table.
27-
-- This works now on Debian and Ubuntu Linux.
28-
2925

3026
Mail module
3127
--------------------------------------

‎install/dist/lib/debian60.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function configure_dovecot()
118118
chgrp($config_dir.'/'.$configfile, 'root');
119119

120120
// Dovecot shall ignore mounts in website directory
121-
exec("doveadm mount add '/var/www/*' ignore");
121+
if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
122122

123123
}
124124

‎install/lib/installer_base.lib.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ public function configure_mailman($status = 'insert') {
633633

634634
//* Create aliasaes
635635
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
636+
if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman');
636637

637638
}
638639

@@ -1007,7 +1008,7 @@ public function configure_dovecot() {
10071008
chgrp($config_dir.'/'.$configfile, 'root');
10081009

10091010
// Dovecot shall ignore mounts in website directory
1010-
exec("doveadm mount add '/var/www/*' ignore");
1011+
if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
10111012

10121013
}
10131014

@@ -2136,6 +2137,13 @@ public function install_ispconfig() {
21362137

21372138
//* Remove Domain module as its functions are available in the client module now
21382139
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
2140+
2141+
//* Disable rkhunter run and update in debian cronjob as ispconfig is running and updating rkhunter
2142+
if(is_file('/etc/default/rkhunter')) {
2143+
replaceLine('/etc/default/rkhunter', 'CRON_DAILY_RUN="yes"', 'CRON_DAILY_RUN="no"', 1, 0);
2144+
replaceLine('/etc/default/rkhunter', 'CRON_DB_UPDATE="yes"', 'CRON_DB_UPDATE="no"', 1, 0);
2145+
}
2146+
21392147

21402148

21412149
}

‎install/lib/update.lib.php‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929

3030
//* Installer patch stub class
3131
class installer_patch_update {
32-
protected function onBeforeSQL() {
32+
public function onBeforeSQL() {
3333
}
3434

35-
protected function onAfterSQL() {
35+
public function onAfterSQL() {
3636
}
3737

3838
}
@@ -164,6 +164,9 @@ function updateDbAndIni() {
164164
$next_db_version = intval($current_db_version + 1);
165165
$sql_patch_filename = realpath(dirname(__FILE__).'/../').'/sql/incremental/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.sql';
166166
$php_patch_filename = realpath(dirname(__FILE__).'/../').'/patches/upd_'.str_pad($next_db_version, 4, '0', STR_PAD_LEFT).'.php';
167+
168+
// comma separated list of version numbers were a update has to be done silently
169+
$silent_update_versions = '75';
167170

168171
if(is_file($sql_patch_filename)) {
169172

@@ -186,10 +189,14 @@ function updateDbAndIni() {
186189

187190
//* Load patch file into database
188191
if( !empty($conf["mysql"]["admin_password"]) ) {
189-
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);
192+
$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;
190193
} else {
191-
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);
194+
$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;
192195
}
196+
197+
if(in_array($next_db_version,explode(',',$silent_update_versions))) $cmd .= ' > /dev/null 2> /dev/null';
198+
system($cmd);
199+
193200
swriteln($inst->lng('Loading SQL patch file').': '.$sql_patch_filename);
194201

195202
//* Exec onAfterSQL function

‎install/sql/incremental/upd_0003.sql‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
ALTER TABLE `software_package` ADD `package_remote_functions` TEXT NULL AFTER `package_requires_db`;
21
ALTER TABLE `client` ADD `customer_no` VARCHAR( 64 ) NULL AFTER `contact_name` , ADD `vat_id` VARCHAR( 64 ) NULL AFTER `customer_no`;

‎install/sql/incremental/upd_0050.sql‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,19 @@
1+
CREATE TABLE IF NOT EXISTS `dns_slave` (
2+
`id` int(10) unsigned NOT NULL auto_increment,
3+
`sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
4+
`sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
5+
`sys_perm_user` varchar(5) NOT NULL DEFAULT '',
6+
`sys_perm_group` varchar(5) NOT NULL DEFAULT '',
7+
`sys_perm_other` varchar(5) NOT NULL DEFAULT '',
8+
`server_id` int(11) NOT NULL default '1',
9+
`origin` varchar(255) NOT NULL DEFAULT '',
10+
`ns` varchar(255) NOT NULL DEFAULT '',
11+
`active` enum('N','Y') NOT NULL DEFAULT 'N',
12+
`xfer` varchar(255) NOT NULL DEFAULT '',
13+
PRIMARY KEY (`id`),
14+
KEY `origin` (`origin`),
15+
KEY `active` (`active`)
16+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
17+
118
ALTER TABLE `dns_slave` DROP INDEX `origin`;
219
ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);

‎install/sql/incremental/upd_0068.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ALTER TABLE `dbispconfig`.`web_domain` ADD UNIQUE `serverdomain` ( `server_id` , `domain` );
1+
ALTER TABLE `web_domain` ADD UNIQUE `serverdomain` ( `server_id` , `domain` );
22

33
ALTER TABLE `dns_rr` DROP KEY rr,
44
CHANGE `name` `name` VARCHAR( 128 ) NOT NULL,

‎install/sql/incremental/upd_0071.sql‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ ALTER TABLE `client`
33
ALTER TABLE `client_template`
44
ADD `limit_database_quota` int(11) NOT NULL default '-1' AFTER `limit_database`;
55
ALTER TABLE `web_database`
6-
ADD `database_quota` int(11) unsigned DEFAULT NULL AFTER `database_name_prefix`,
7-
ADD `last_quota_notification` date NULL default NULL;
6+
ADD `database_quota` int(11) unsigned DEFAULT NULL AFTER `database_name_prefix`;

‎install/sql/incremental/upd_0073.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ALTER TABLE `client_template` ADD `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_webdav_user`;
2+
ALTER TABLE `client` ADD `limit_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_webdav_user`;
3+
ALTER TABLE `web_domain` CHANGE `php_fpm_use_socket` `php_fpm_use_socket` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y';
4+
ALTER TABLE `mail_domain` ADD `dkim_selector` VARCHAR(63) NOT NULL DEFAULT 'default' AFTER `dkim`;

‎install/sql/incremental/upd_0074.sql‎

Lines changed: 250 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,250 @@
1+
ALTER TABLE `aps_instances`
2+
CHANGE `customer_id` `customer_id` int(4) NOT NULL DEFAULT '0',
3+
CHANGE `package_id` `package_id` int(4) NOT NULL DEFAULT '0',
4+
CHANGE `instance_status` `instance_status` int(4) NOT NULL DEFAULT '0';
5+
6+
ALTER TABLE `aps_instances_settings`
7+
CHANGE `instance_id` `instance_id` int(4) NOT NULL DEFAULT '0',
8+
CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
9+
CHANGE `value` `value` text;
10+
11+
ALTER TABLE `aps_packages`
12+
CHANGE `path` `path` varchar(255) NOT NULL DEFAULT '',
13+
CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
14+
CHANGE `category` `category` varchar(255) NOT NULL DEFAULT '',
15+
CHANGE `version` `version` varchar(20) NOT NULL DEFAULT '',
16+
CHANGE `release` `release` int(4) NOT NULL DEFAULT '0',
17+
CHANGE `package_url` `package_url` TEXT;
18+
19+
ALTER TABLE `aps_settings`
20+
CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
21+
CHANGE `value` `value` text;
22+
23+
ALTER TABLE `attempts_login`
24+
CHANGE `ip` `ip` varchar(39) NOT NULL DEFAULT '';
25+
26+
ALTER TABLE `client`
27+
CHANGE `internet` `internet` varchar(255) NOT NULL DEFAULT '',
28+
CHANGE `mail_servers` `mail_servers` blob,
29+
CHANGE `web_servers` `web_servers` blob,
30+
CHANGE `db_servers` `db_servers` blob,
31+
CHANGE `dns_servers` `dns_servers` blob,
32+
CHANGE `template_additional` `template_additional` text;
33+
34+
ALTER TABLE `client_template`
35+
CHANGE `template_name` `template_name` varchar(64) NOT NULL DEFAULT '';
36+
37+
ALTER TABLE `country`
38+
CHANGE `iso` `iso` char(2) NOT NULL DEFAULT '',
39+
CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
40+
CHANGE `printable_name` `printable_name` varchar(64) NOT NULL DEFAULT '';
41+
42+
ALTER TABLE `cron`
43+
CHANGE `command` `command` TEXT;
44+
45+
ALTER TABLE `dns_rr`
46+
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
47+
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
48+
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
49+
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
50+
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
51+
CHANGE `zone` `zone` int(11) unsigned NOT NULL DEFAULT '0',
52+
CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
53+
CHANGE `data` `data` varchar(255) NOT NULL DEFAULT '';
54+
55+
ALTER TABLE `dns_slave`
56+
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
57+
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
58+
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
59+
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
60+
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
61+
CHANGE `origin` `origin` varchar(255) NOT NULL DEFAULT '',
62+
CHANGE `ns` `ns` varchar(255) NOT NULL DEFAULT '',
63+
CHANGE `active` `active` enum('N','Y') NOT NULL DEFAULT 'N',
64+
CHANGE `xfer` `xfer` varchar(255) NOT NULL DEFAULT '';
65+
66+
ALTER TABLE `dns_soa`
67+
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
68+
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
69+
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
70+
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
71+
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
72+
CHANGE `origin` `origin` varchar(255) NOT NULL DEFAULT '',
73+
CHANGE `ns` `ns` varchar(255) NOT NULL DEFAULT '',
74+
CHANGE `mbox` `mbox` varchar(255) NOT NULL DEFAULT '',
75+
CHANGE `active` `active` enum('N','Y') NOT NULL DEFAULT 'N',
76+
CHANGE `xfer` `xfer` varchar(255) NOT NULL DEFAULT '';
77+
78+
ALTER TABLE `mail_access`
79+
CHANGE `source` `source` varchar(255) NOT NULL DEFAULT '',
80+
CHANGE `access` `access` varchar(255) NOT NULL DEFAULT '',
81+
CHANGE `type` `type` set('recipient','sender','client') NOT NULL DEFAULT 'recipient';
82+
83+
ALTER TABLE `mail_backup`
84+
CHANGE `server_id` `server_id` int(10) unsigned NOT NULL DEFAULT '0',
85+
CHANGE `parent_domain_id` `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
86+
CHANGE `mailuser_id` `mailuser_id` int(10) unsigned NOT NULL DEFAULT '0',
87+
CHANGE `tstamp` `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
88+
CHANGE `filename` `filename` varchar(255) NOT NULL DEFAULT '',
89+
CHANGE `filesize` `filesize` VARCHAR(10) NOT NULL DEFAULT '';
90+
91+
ALTER TABLE `mail_domain`
92+
CHANGE `active` `active` enum('n','y') NOT NULL DEFAULT 'n';
93+
94+
ALTER TABLE `mail_forwarding`
95+
CHANGE `source` `source` varchar(255) NOT NULL DEFAULT '',
96+
CHANGE `active` `active` enum('n','y') NOT NULL DEFAULT 'n';
97+
98+
ALTER TABLE `mail_mailinglist`
99+
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
100+
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
101+
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
102+
CHANGE `domain` `domain` varchar(255) NOT NULL DEFAULT '',
103+
CHANGE `listname` `listname` varchar(255) NOT NULL DEFAULT '',
104+
CHANGE `email` `email` varchar(255) NOT NULL DEFAULT '',
105+
CHANGE `password` `password` varchar(255) NOT NULL DEFAULT '';
106+
107+
ALTER TABLE `mail_traffic`
108+
CHANGE `mailuser_id` `mailuser_id` int(11) unsigned NOT NULL DEFAULT '0',
109+
CHANGE `month` `month` char(7) NOT NULL DEFAULT '',
110+
CHANGE `traffic` `traffic` bigint(20) unsigned NOT NULL DEFAULT '0';
111+
112+
ALTER TABLE `mail_transport`
113+
CHANGE `transport` `transport` varchar(255) NOT NULL DEFAULT '',
114+
CHANGE `active` `active` enum('n','y') NOT NULL DEFAULT 'n';
115+
116+
ALTER TABLE `mail_user`
117+
CHANGE `login` `login` varchar(255) NOT NULL default '',
118+
CHANGE `password` `password` varchar(255) NOT NULL default '',
119+
CHANGE `homedir` `homedir` varchar(255) NOT NULL default '',
120+
CHANGE `postfix` `postfix` enum('n','y') NOT NULL default 'y',
121+
CHANGE `access` `access` enum('n','y') NOT NULL default 'y';
122+
123+
ALTER TABLE `monitor_data`
124+
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL default '0',
125+
CHANGE `type` `type` varchar(255) NOT NULL default '',
126+
CHANGE `created` `created` int(11) unsigned NOT NULL default '0',
127+
CHANGE `data` `data` mediumtext;
128+
129+
ALTER TABLE `openvz_ostemplate`
130+
CHANGE `template_file` `template_file` varchar(255) NOT NULL DEFAULT '';
131+
132+
ALTER TABLE `openvz_traffic`
133+
CHANGE `veid` `veid` int(11) NOT NULL DEFAULT '0',
134+
CHANGE `traffic_date` `traffic_date` date NOT NULL DEFAULT '0000-00-00';
135+
136+
ALTER TABLE `openvz_vm`
137+
CHANGE `veid` `veid` int(10) unsigned NOT NULL DEFAULT '0',
138+
CHANGE `ip_address` `ip_address` varchar(255) NOT NULL DEFAULT '',
139+
CHANGE `active_until_date` `active_until_date` date NOT NULL DEFAULT '0000-00-00',
140+
CHANGE `capability` `capability` text,
141+
CHANGE `config` `config` mediumtext;
142+
143+
ALTER TABLE `remote_session`
144+
CHANGE `remote_session` `remote_session` varchar(64) NOT NULL DEFAULT '',
145+
CHANGE `remote_userid` `remote_userid` int(11) unsigned NOT NULL DEFAULT '0',
146+
CHANGE `remote_functions` `remote_functions` text,
147+
CHANGE `tstamp` `tstamp` int(10) unsigned NOT NULL DEFAULT '0';
148+
149+
ALTER TABLE `remote_user`
150+
CHANGE `remote_username` `remote_username` varchar(64) NOT NULL DEFAULT '',
151+
CHANGE `remote_password` `remote_password` varchar(64) NOT NULL DEFAULT '',
152+
CHANGE `remote_functions` `remote_functions` text;
153+
154+
ALTER TABLE `server`
155+
CHANGE `config` `config` text;
156+
157+
ALTER TABLE `shell_user`
158+
CHANGE `chroot` `chroot` varchar(255) NOT NULL DEFAULT '',
159+
CHANGE `ssh_rsa` `ssh_rsa` text;
160+
161+
ALTER TABLE `software_update`
162+
CHANGE `software_repo_id` `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
163+
CHANGE `package_name` `package_name` varchar(64) NOT NULL DEFAULT '',
164+
CHANGE `update_url` `update_url` varchar(255) NOT NULL DEFAULT '',
165+
CHANGE `update_md5` `update_md5` varchar(255) NOT NULL DEFAULT '',
166+
CHANGE `update_dependencies` `update_dependencies` varchar(255) NOT NULL DEFAULT '',
167+
CHANGE `update_title` `update_title` varchar(64) NOT NULL DEFAULT '';
168+
169+
ALTER TABLE `software_update_inst`
170+
CHANGE `package_name` `package_name` varchar(64) NOT NULL DEFAULT '',
171+
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0';
172+
173+
ALTER TABLE `spamfilter_policy`
174+
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
175+
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
176+
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
177+
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
178+
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '';
179+
180+
181+
ALTER TABLE `spamfilter_users`
182+
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
183+
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
184+
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
185+
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
186+
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
187+
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
188+
CHANGE `email` `email` varchar(255) NOT NULL DEFAULT '';
189+
190+
ALTER TABLE `spamfilter_wblist`
191+
CHANGE `sys_userid` `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
192+
CHANGE `sys_groupid` `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
193+
CHANGE `sys_perm_user` `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
194+
CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
195+
CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
196+
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
197+
CHANGE `rid` `rid` int(11) unsigned NOT NULL DEFAULT '0',
198+
CHANGE `email` `email` varchar(255) NOT NULL DEFAULT '',
199+
CHANGE `priority` `priority` tinyint(3) unsigned NOT NULL DEFAULT '0';
200+
201+
ALTER TABLE `sys_config`
202+
CHANGE `group` `group` varchar(64) NOT NULL DEFAULT '',
203+
CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
204+
CHANGE `value` `value` varchar(255) NOT NULL DEFAULT '';
205+
206+
ALTER TABLE `sys_cron`
207+
CHANGE `name` `name` varchar(50) NOT NULL DEFAULT '';
208+
209+
ALTER TABLE `sys_datalog`
210+
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
211+
CHANGE `data` `data` longtext;
212+
213+
ALTER TABLE `sys_group`
214+
CHANGE `description` `description` text;
215+
216+
ALTER TABLE `sys_ini`
217+
CHANGE `config` `config` longtext;
218+
219+
ALTER TABLE `sys_log`
220+
CHANGE `tstamp` `tstamp` int(11) unsigned NOT NULL DEFAULT '0';
221+
222+
ALTER TABLE `sys_remoteaction`
223+
CHANGE `server_id` `server_id` int(11) unsigned NOT NULL DEFAULT '0',
224+
CHANGE `tstamp` `tstamp` int(11) NOT NULL DEFAULT '0',
225+
CHANGE `action_type` `action_type` varchar(20) NOT NULL DEFAULT '',
226+
CHANGE `action_param` `action_param` mediumtext,
227+
CHANGE `action_state` `action_state` enum('pending','ok','warning','error') NOT NULL DEFAULT 'pending',
228+
CHANGE `response` `response` mediumtext;
229+
230+
ALTER TABLE `sys_theme`
231+
CHANGE `tpl_name` `tpl_name` varchar(32) NOT NULL DEFAULT '',
232+
CHANGE `username` `username` varchar(64) NOT NULL DEFAULT '',
233+
CHANGE `logo_url` `logo_url` varchar(255) NOT NULL DEFAULT '';
234+
235+
ALTER TABLE `sys_user`
236+
CHANGE `groups` `groups` TEXT;
237+
238+
ALTER TABLE `web_backup`
239+
CHANGE `server_id` `server_id` int(10) unsigned NOT NULL DEFAULT '0',
240+
CHANGE `parent_domain_id` `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
241+
CHANGE `tstamp` `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
242+
CHANGE `filename` `filename` varchar(255) NOT NULL DEFAULT '',
243+
CHANGE `filesize` `filesize` VARCHAR(10) NOT NULL DEFAULT '';
244+
245+
ALTER TABLE `web_database`
246+
CHANGE `remote_ips` `remote_ips` text;
247+
248+
ALTER TABLE `web_traffic`
249+
CHANGE `hostname` `hostname` varchar(255) NOT NULL DEFAULT '',
250+
CHANGE `traffic_date` `traffic_date` date NOT NULL DEFAULT '0000-00-00';

0 commit comments

Comments
 (0)