diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index b32cf0189b0d8a0d433bad78bebdc5226655322b..2f4d7db3a47265fef8a138bc5c5330fd0635199e 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -27,6 +27,7 @@ munin_url=
munin_user=
munin_password=
monitor_system_updates=y
+migration_mode=n
[mail]
module=postfix_mysql
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 5cf56ca5372befe9de7d5de2c930d476d99b7bc8..6c9e56772b33a1b6a65f509aa212c8d49bb00b42 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -363,6 +363,12 @@ $form["tabs"]['server'] = array(
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
+ 'migration_mode' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
//#################################
// ENDE Datatable fields
//#################################
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index 9d4622f0bf8dd651259ce6a289a3d08bc9a08b34..69c6427c68c3d6ee2b2e10d547effc4a6302e94b 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 671de95ab93a150bebbc96dfbb17c52464ee4115..88d19cd60a9f3be6b75752795a357569ba9a545b 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index f4bcb4da6d12d5f4f94590dd7a817c335b6c314b..23c464b39c5fce801f71abd193b4820a60827613 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Hora do backup';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng
index 5309d986c5ecedd986e13ac768ba7989dcf809c1..57de732bfa4d41b6e5567f0aabf0a43c9ca3e170 100644
--- a/interface/web/admin/lib/lang/ca_server_config.lng
+++ b/interface/web/admin/lib/lang/ca_server_config.lng
@@ -282,4 +282,5 @@ $wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index 0bc67a16592f6a8e06ea5085d14b522c946c14cb..48d586c71ff619b2b60ca07336466cebaf622526 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -282,4 +282,5 @@ $wb['hostname_error_empty'] = 'Název hostitele je prázdný';
$wb['hostname_error_regex'] = 'Neplatný název hostitele.';
$wb['backup_time_txt'] = 'Spustit zálohovaní v';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 6e5cec146d7a7dba80bde2f99d02ee32d89df5c6..2656243d6aa05abfabb2fb47ab88c0ba676a72f2 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng
index a8cc531fa65555751ba30d682d43645efc0bd8a9..b7e9b3f831ae19fd4973c41a2ac02ee85b9dd75a 100644
--- a/interface/web/admin/lib/lang/dk_server_config.lng
+++ b/interface/web/admin/lib/lang/dk_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index b270bf537c370ee052ff426889a541a84dfc5912..00266d17620295e0c942853dbcd8b81c146f79e9 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 018904cc7869779579b21f9118f53818d0ece9c6..80849cb5a795f23962d6a1e90849fa656b9c4cd5 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -268,8 +268,6 @@ $wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php
$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
$wb['enable_spdy_txt'] = 'Makes SPDY available';
$wb['web_settings_txt'] = 'Web Server';
-
-// New for XMPP
$wb['xmpp_server_txt'] = 'XMPP Server';
$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
@@ -285,4 +283,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index 7d15c884dcc5122814f8aea3c8e7d113cd68fd8d..a0ce5ddbe4a9c93e2677996c0e9cb5cda31f7f9a 100755
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_server_txt'] = 'Servidor XMPP';
$wb['xmpp_use_ipv6_txt'] = 'Usar IPv6';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index 837b9d7672adefc679f3667364ed536f7c2c0e8c..6c44a61b224d4f4981c7c069294c3bd10ae861e1 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index dbc744962a9f9152a983213b1195b1d2880ea03d..864f8dcfb9344dc920c7dfc824d2f5fd7bafaf4e 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -282,4 +282,5 @@ $wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index df7236cf542b5f791003df708e63f508c74ad3f7..6434d30e3e38965d6e4ba14be405972d9ec0a33e 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index 6b35c2d135016f71b5f066e9aeb4c316e9935ccd..ec2476f0a8ecfd072c4e267dccdfa0aadd262012 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index 9752fb0a088487fb4252fb826a6c91bbe4bd8612..1c4e088457e534cfefa1851445354f88224903d8 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index f9b0922e8c4e3e1bc5a5e75f38e9c343cd3ad555..80a5d05208a632f27b281879695bdca95e412cdd 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -282,4 +282,5 @@ $wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 275c4ecb3fd4dc78e3422b9fda539b8eb4d2af5f..639d5578053a937ca4c3a67dc98c5f83b96cbfd7 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index 65dfdad431ec00c249d47b82e29ecf1fe2f96ff0..000fba4277d82fceac511e1a3d73b0998bebcfad 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index c2092a1c1922cb157a2280e346905e0cce30c095..ae252eacf604329875bc200f2cc6d16f76e912c7 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 7e5cbf79f18ae34c7912dbe63f2b16ed69412e77..f1f23ee0cd5a2489ec35b4c8a41519a45b499bd4 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index fd2b3f832f5b5cf1a7cbb310e73428acea5a545f..f6fbdeec8360c9b5de6f7cd434835f045984bb4a 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index bf6386a06f02ab49a9832f572b4ab3753fc90a11..cbf98487abaa09aebd6a3600948d7f1ba208d237 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Время копирования';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index d3fa0402eb75fa8d536ce920efccf1ef7e4651d3..b4224e99755b20491473831dbefd8b317b1a0ee1 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index 5ee3ab78d8c84aeb968f4a3abf9a2fc73c442f30..e3f4d565a959bb4eef3c7e4c1836b359e678a7f0 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
index 4fbc90cb8c6210c530de21f4d13a4fe86209019e..542d02e5308ecb290fc1ed7c1c9717b7717aa61e 100644
--- a/interface/web/admin/lib/lang/tr_server_config.lng
+++ b/interface/web/admin/lib/lang/tr_server_config.lng
@@ -282,4 +282,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
$wb['skip_le_check_txt'] = 'Skip Lets Encrypt Check';
+$wb['migration_mode_txt'] = 'Server Migration Mode';
?>
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 3156ca797a091c6dceed2a5e6affff3570fe0446..7868e87568d91797de16192f7d2deb16cce45885 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -101,6 +101,12 @@
{tmpl_var name='monitor_system_updates'}
+