From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Thu, 2 Nov 2017 16:01:52 +0000 (+0100)
Subject: Windows Wizard: Missing ticket should tell the user about the master signing
X-Git-Tag: v2.8.0~20^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=299464e31e9b1a7383d6c56cfecb5dec8e9d1a9a;p=icinga2

Windows Wizard: Missing ticket should tell the user about the master signing

refs #5681
---

diff --git a/agent/windows-setup-agent/SetupWizard.Designer.cs b/agent/windows-setup-agent/SetupWizard.Designer.cs
index 4667e5e2b..e0f42a156 100644
--- a/agent/windows-setup-agent/SetupWizard.Designer.cs
+++ b/agent/windows-setup-agent/SetupWizard.Designer.cs
@@ -144,7 +144,7 @@
 			this.lblSetupCompleted.Name = "lblSetupCompleted";
 			this.lblSetupCompleted.Size = new System.Drawing.Size(214, 13);
 			this.lblSetupCompleted.TabIndex = 0;
-			this.lblSetupCompleted.Text = "The Icinga 2 agent was set up successfully.";
+			this.lblSetupCompleted.Text = "The Icinga 2 Windows client was set up successfully.";
 			// 
 			// tabConfigure
 			// 
diff --git a/agent/windows-setup-agent/SetupWizard.cs b/agent/windows-setup-agent/SetupWizard.cs
index 37633f15b..b14acf2ac 100644
--- a/agent/windows-setup-agent/SetupWizard.cs
+++ b/agent/windows-setup-agent/SetupWizard.cs
@@ -274,6 +274,14 @@ namespace Icinga
 
 			SetConfigureStatus(100, "Finished.");
 
+			// Override the completed text
+			lblSetupCompleted.Text = "The Icinga 2 Windows client was set up successfully.";
+
+			// Add a note for the user for ticket-less signing
+			if (txtTicket.Text == "") {
+				lblSetupCompleted.Text += "\n\nTicket was not specified. Please sign the certificate request on the Icinga 2 master node (requires v2.8+).";
+			}
+
 			FinishConfigure();
 		}