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 4667e5e2b6bbee9044fbf4e00a4df29e85098b26..e0f42a156679507ff4e9598c1b413c6a09c7f03b 100644 (file)
--- 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 37633f15bc930546b4bfb9fd410332ac61acd7de..b14acf2ac2f3e9e52a514a62986899c1528e3bb6 100644 (file)
--- 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();
                }