Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

Author: Till Brehm

install/sql/incremental/upd_0026.sql

@@ -1 +1 @@
-ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
+ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;

install/sql/incremental/upd_0042.sql

@@ -1,4 +1,4 @@
 
 -- increase column size
-ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL DEFAULT '';
+ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;
 

install/sql/incremental/upd_0067.sql

@@ -1,7 +1,7 @@
 ALTER TABLE `client`
-	ADD `web_servers` blob NOT NULL DEFAULT '' AFTER `default_webserver`,
-	ADD `mail_servers` blob NOT NULL DEFAULT '' AFTER `default_mailserver`,
-	ADD `db_servers` blob NOT NULL DEFAULT '' AFTER `default_dbserver`,
-	ADD `dns_servers` blob NOT NULL DEFAULT '' AFTER `default_dnsserver`;
+	ADD `web_servers` blob NOT NULL AFTER `default_webserver`,
+	ADD `mail_servers` blob NOT NULL AFTER `default_mailserver`,
+	ADD `db_servers` blob NOT NULL AFTER `default_dbserver`,
+	ADD `dns_servers` blob NOT NULL AFTER `default_dnsserver`;
 
 UPDATE `client` SET `web_servers` = `default_webserver`, `mail_servers` = `default_mailserver`, `db_servers` = `default_dbserver`, `dns_servers` = `default_dnsserver` WHERE 1;