From 36e78c8972ba4bcea46ab2b6de9e089a8fffe85f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 14 Jan 2020 16:28:44 +0100
Subject: [dnbd3] Always add DNBD3 servers to config (for stage4)

Also, change translations for "enable dnbd3" to refer to VMs
specifically.
---
 modules-available/dnbd3/baseconfig/getconfig.inc.php | 15 ++++++++-------
 modules-available/dnbd3/lang/de/template-tags.json   |  4 ++--
 modules-available/dnbd3/lang/en/template-tags.json   |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules-available/dnbd3/baseconfig/getconfig.inc.php b/modules-available/dnbd3/baseconfig/getconfig.inc.php
index 6f484fc5..ca0f7a9a 100644
--- a/modules-available/dnbd3/baseconfig/getconfig.inc.php
+++ b/modules-available/dnbd3/baseconfig/getconfig.inc.php
@@ -1,11 +1,13 @@
 <?php
 
-if (!Dnbd3::isEnabled()) return;
+if (Dnbd3::isEnabled()) {
+	if (!Dnbd3::hasNfsFallback()) {
+		ConfigHolder::add("SLX_VM_NFS", false, 1000);
+		ConfigHolder::add("SLX_VM_NFS_USER", false, 1000);
+		ConfigHolder::add("SLX_VM_NFS_PASSWD", false, 1000);
+	}
 
-if (!Dnbd3::hasNfsFallback()) {
-	ConfigHolder::add("SLX_VM_NFS", false, 1000);
-	ConfigHolder::add("SLX_VM_NFS_USER", false, 1000);
-	ConfigHolder::add("SLX_VM_NFS_PASSWD", false, 1000);
+	ConfigHolder::add('SLX_VM_DNBD3', 'yes');
 }
 
 // Locations from closest to furthest (order)
@@ -62,5 +64,4 @@ foreach ($servers as $k => $v) {
 
 asort($servers, SORT_NUMERIC | SORT_ASC);
 ConfigHolder::add('SLX_DNBD3_SERVERS', implode(' ', array_keys($servers)));
-ConfigHolder::add('SLX_DNBD3_FALLBACK', implode(' ', array_keys($fallback)));
-ConfigHolder::add('SLX_VM_DNBD3', 'yes');
+ConfigHolder::add('SLX_DNBD3_FALLBACK', implode(' ', array_keys($fallback)));
\ No newline at end of file
diff --git a/modules-available/dnbd3/lang/de/template-tags.json b/modules-available/dnbd3/lang/de/template-tags.json
index de673450..f7323530 100644
--- a/modules-available/dnbd3/lang/de/template-tags.json
+++ b/modules-available/dnbd3/lang/de/template-tags.json
@@ -6,7 +6,7 @@
     "lang_backgroundReplication": "Replikation im Hintergrund",
     "lang_backgroundReplicationInfo": "Sobald eine VM \u00fcber den Proxy angefragt wird, spiegelt der Proxy im Hintergrund den vollst\u00e4ndigen Inhalt des VM-Abbildes, nicht nur die angefragten Bl\u00f6cke.",
     "lang_bytesSent": "Gesendet",
-    "lang_changeDnbd3Status": "DNBD3 ein-\/ausschalten",
+    "lang_changeDnbd3Status": "VM-Auslieferung via DNBD3 ein-\/ausschalten",
     "lang_client": "Client",
     "lang_clientCount": "Clients",
     "lang_clientList": "Liste der Clients",
@@ -21,7 +21,7 @@
     "lang_dnbd3Management": "DNBD3 Verwaltung",
     "lang_dnbd3Status": "DNBD3 Status",
     "lang_editProxyHeading": "Proxy-Einstellungen bearbeiten",
-    "lang_enableDnbd3": "DNBD3 aktivieren",
+    "lang_enableDnbd3": "DNBD3 f\u00fcr VMs aktivieren",
     "lang_enabled": "Aktiviert",
     "lang_enterIpOfServer": "Bitte geben Sie die IP-Adresse des hinzuzuf\u00fcgenden Servers ein",
     "lang_externalServer": "Externer DNBD3-Server",
diff --git a/modules-available/dnbd3/lang/en/template-tags.json b/modules-available/dnbd3/lang/en/template-tags.json
index cae5ad39..a787cfdb 100644
--- a/modules-available/dnbd3/lang/en/template-tags.json
+++ b/modules-available/dnbd3/lang/en/template-tags.json
@@ -6,7 +6,7 @@
     "lang_backgroundReplication": "Background replication",
     "lang_backgroundReplicationInfo": "If a VM is requested by this proxy, the proxy mirrors the complete VM in the background, not only the requested data blocks.",
     "lang_bytesSent": "Sent",
-    "lang_changeDnbd3Status": "Enable\/disable DNBD3",
+    "lang_changeDnbd3Status": "Enable\/disable DNBD3 for VMs",
     "lang_client": "Client",
     "lang_clientCount": "Clients",
     "lang_clientList": "List of clients",
@@ -21,7 +21,7 @@
     "lang_dnbd3Management": "DNBD3 management",
     "lang_dnbd3Status": "DNBD3 status",
     "lang_editProxyHeading": "Edit proxy settings",
-    "lang_enableDnbd3": "Enable DNBD3",
+    "lang_enableDnbd3": "Enable DNBD3 for VMs",
     "lang_enabled": "Enabled",
     "lang_enterIpOfServer": "Please enter the ip address ot the server",
     "lang_externalServer": "External DNBD3-Server",
-- 
cgit v1.2.3-55-g7522