Added a server migration mode setting which will be used to prevent that LE tries to recreate certs during a server migration.

Till Brehm · Till Brehm · commit 4baefe24066c · 2017-07-12T16:02:11.000+02:00
diff --git 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
@@ -363,6 +363,12 @@
 			'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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -101,6 +101,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
                     {tmpl_var name='monitor_system_updates'}
                 </div>
             </div>
+			<div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='migration_mode_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='migration_mode'}
+                </div>
+            </div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
