Cleanup Windows wizard and prepare for enhanced CSR signing

refs #5681

diff --git a/agent/windows-setup-agent/SetupWizard.Designer.cs b/agent/windows-setup-agent/SetupWizard.Designer.cs
index 39fe021faf3b995f3fa2077af9fa2ef515fa62b6..4667e5e2b6bbee9044fbf4e00a4df29e85098b26 100644 (file)
--- a/agent/windows-setup-agent/SetupWizard.Designer.cs
+++ b/agent/windows-setup-agent/SetupWizard.Designer.cs
@@ -54,14 +54,13 @@
                        this.lblListenerPort = new System.Windows.Forms.Label();
                        this.rdoListener = new System.Windows.Forms.RadioButton();
                        this.groupBox1 = new System.Windows.Forms.GroupBox();
+                       this.btnEditEndpoint = new System.Windows.Forms.Button();
                        this.btnRemoveEndpoint = new System.Windows.Forms.Button();
                        this.btnAddEndpoint = new System.Windows.Forms.Button();
                        this.lvwEndpoints = new System.Windows.Forms.ListView();
                        this.colInstanceName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
                        this.colHost = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
                        this.colPort = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-                       this.rdoNoMaster = new System.Windows.Forms.RadioButton();
-                       this.rdoNewMaster = new System.Windows.Forms.RadioButton();
                        this.tbcPages = new System.Windows.Forms.TabControl();
                        this.tabRetrieveCertificate = new System.Windows.Forms.TabPage();
                        this.lblRetrieveCertificate = new System.Windows.Forms.Label();
@@ -81,7 +80,6 @@
                        this.txtError = new System.Windows.Forms.TextBox();
                        this.lblError = new System.Windows.Forms.Label();
                        this.picBanner = new System.Windows.Forms.PictureBox();
-                       this.btnEditEndpoint = new System.Windows.Forms.Button();
                        this.tabFinish.SuspendLayout();
                        this.tabConfigure.SuspendLayout();
                        this.tabParameters.SuspendLayout();
@@ -95,9 +93,9 @@
                        this.tabError.SuspendLayout();
                        ((System.ComponentModel.ISupportInitialize)(this.picBanner)).BeginInit();
                        this.SuspendLayout();
-                       //
+                       // 
                        // btnBack
-                       //
+                       // 
                        this.btnBack.Enabled = false;
                        this.btnBack.Location = new System.Drawing.Point(367, 592);
                        this.btnBack.Name = "btnBack";
@@ -106,9 +104,9 @@
                        this.btnBack.Text = "< &Back";
                        this.btnBack.UseVisualStyleBackColor = true;
                        this.btnBack.Click += new System.EventHandler(this.btnBack_Click);
-                       //
+                       // 
                        // btnNext
-                       //
+                       // 
                        this.btnNext.Location = new System.Drawing.Point(448, 592);
                        this.btnNext.Name = "btnNext";
                        this.btnNext.Size = new System.Drawing.Size(75, 23);
@@ -116,9 +114,9 @@
                        this.btnNext.Text = "&Next >";
                        this.btnNext.UseVisualStyleBackColor = true;
                        this.btnNext.Click += new System.EventHandler(this.btnNext_Click);
-                       //
+                       // 
                        // btnCancel
-                       //
+                       // 
                        this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
                        this.btnCancel.Location = new System.Drawing.Point(538, 592);
                        this.btnCancel.Name = "btnCancel";
@@ -127,9 +125,9 @@
                        this.btnCancel.Text = "Cancel";
                        this.btnCancel.UseVisualStyleBackColor = true;
                        this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-                       //
+                       // 
                        // tabFinish
-                       //
+                       // 
                        this.tabFinish.Controls.Add(this.lblSetupCompleted);
                        this.tabFinish.Location = new System.Drawing.Point(4, 5);
                        this.tabFinish.Name = "tabFinish";
@@ -138,18 +136,18 @@
                        this.tabFinish.TabIndex = 5;
                        this.tabFinish.Text = "Finish";
                        this.tabFinish.UseVisualStyleBackColor = true;
-                       //
+                       // 
                        // lblSetupCompleted
-                       //
+                       // 
                        this.lblSetupCompleted.AutoSize = true;
                        this.lblSetupCompleted.Location = new System.Drawing.Point(34, 35);
                        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.";
-                       //
+                       // 
                        // tabConfigure
-                       //
+                       // 
                        this.tabConfigure.Controls.Add(this.lblConfigStatus);
                        this.tabConfigure.Controls.Add(this.prgConfig);
                        this.tabConfigure.Location = new System.Drawing.Point(4, 5);
@@ -159,25 +157,25 @@
                        this.tabConfigure.TabIndex = 4;
                        this.tabConfigure.Text = "Configure Icinga 2";
                        this.tabConfigure.UseVisualStyleBackColor = true;
-                       //
+                       // 
                        // lblConfigStatus
-                       //
+                       // 
                        this.lblConfigStatus.AutoSize = true;
                        this.lblConfigStatus.Location = new System.Drawing.Point(184, 204);
                        this.lblConfigStatus.Name = "lblConfigStatus";
                        this.lblConfigStatus.Size = new System.Drawing.Size(141, 13);
                        this.lblConfigStatus.TabIndex = 1;
                        this.lblConfigStatus.Text = "Updating the configuration...";
-                       //
+                       // 
                        // prgConfig
-                       //
+                       // 
                        this.prgConfig.Location = new System.Drawing.Point(184, 223);
                        this.prgConfig.Name = "prgConfig";
                        this.prgConfig.Size = new System.Drawing.Size(289, 23);
                        this.prgConfig.TabIndex = 0;
-                       //
+                       // 
                        // tabParameters
-                       //
+                       // 
                        this.tabParameters.Controls.Add(this.groupBox3);
                        this.tabParameters.Controls.Add(this.txtTicket);
                        this.tabParameters.Controls.Add(this.lblTicket);
@@ -192,118 +190,118 @@
                        this.tabParameters.TabIndex = 3;
                        this.tabParameters.Text = "Agent Parameters";
                        this.tabParameters.UseVisualStyleBackColor = true;
-                       //
+                       // 
                        // groupBox3
-                       //
+                       // 
                        this.groupBox3.Controls.Add(this.txtUser);
                        this.groupBox3.Controls.Add(this.chkRunServiceAsThisUser);
                        this.groupBox3.Controls.Add(this.chkInstallNSCP);
                        this.groupBox3.Controls.Add(this.chkAcceptConfig);
                        this.groupBox3.Controls.Add(this.chkAcceptCommands);
-                       this.groupBox3.Location = new System.Drawing.Point(308, 359);
+                       this.groupBox3.Location = new System.Drawing.Point(308, 291);
                        this.groupBox3.Name = "groupBox3";
-                       this.groupBox3.Size = new System.Drawing.Size(301, 135);
+                       this.groupBox3.Size = new System.Drawing.Size(301, 188);
                        this.groupBox3.TabIndex = 5;
                        this.groupBox3.TabStop = false;
                        this.groupBox3.Text = "Advanced Options";
-                       //
+                       // 
                        // txtUser
-                       //
+                       // 
                        this.txtUser.Enabled = false;
-                       this.txtUser.Location = new System.Drawing.Point(28, 111);
+                       this.txtUser.Location = new System.Drawing.Point(28, 88);
                        this.txtUser.Name = "txtUser";
                        this.txtUser.Size = new System.Drawing.Size(267, 20);
                        this.txtUser.TabIndex = 8;
                        this.txtUser.Text = "NT AUTHORITY\\NetworkService";
-                       //
+                       // 
                        // chkRunServiceAsThisUser
-                       //
+                       // 
                        this.chkRunServiceAsThisUser.AutoSize = true;
-                       this.chkRunServiceAsThisUser.Location = new System.Drawing.Point(9, 88);
+                       this.chkRunServiceAsThisUser.Location = new System.Drawing.Point(9, 65);
                        this.chkRunServiceAsThisUser.Name = "chkRunServiceAsThisUser";
-                       this.chkRunServiceAsThisUser.Size = new System.Drawing.Size(142, 17);
+                       this.chkRunServiceAsThisUser.Size = new System.Drawing.Size(183, 17);
                        this.chkRunServiceAsThisUser.TabIndex = 7;
-                       this.chkRunServiceAsThisUser.Text = "Run service as this user:";
+                       this.chkRunServiceAsThisUser.Text = "Run Icinga 2 service as this user:";
                        this.chkRunServiceAsThisUser.UseVisualStyleBackColor = true;
                        this.chkRunServiceAsThisUser.CheckedChanged += new System.EventHandler(this.chkRunServiceAsThisUser_CheckedChanged);
-                       //
+                       // 
                        // chkInstallNSCP
-                       //
+                       // 
                        this.chkInstallNSCP.AutoSize = true;
-                       this.chkInstallNSCP.Location = new System.Drawing.Point(9, 65);
+                       this.chkInstallNSCP.Location = new System.Drawing.Point(9, 114);
                        this.chkInstallNSCP.Name = "chkInstallNSCP";
-                       this.chkInstallNSCP.Size = new System.Drawing.Size(149, 17);
+                       this.chkInstallNSCP.Size = new System.Drawing.Size(190, 17);
                        this.chkInstallNSCP.TabIndex = 6;
-                       this.chkInstallNSCP.Text = "Install/Update NSClient++";
+                       this.chkInstallNSCP.Text = "Install/Update bundled NSClient++";
                        this.chkInstallNSCP.UseVisualStyleBackColor = true;
-                       //
+                       // 
                        // chkAcceptConfig
-                       //
+                       // 
                        this.chkAcceptConfig.AutoSize = true;
                        this.chkAcceptConfig.Location = new System.Drawing.Point(9, 42);
                        this.chkAcceptConfig.Name = "chkAcceptConfig";
-                       this.chkAcceptConfig.Size = new System.Drawing.Size(190, 17);
+                       this.chkAcceptConfig.Size = new System.Drawing.Size(230, 17);
                        this.chkAcceptConfig.TabIndex = 1;
-                       this.chkAcceptConfig.Text = "Accept config updates from master";
+                       this.chkAcceptConfig.Text = "Accept config updates from master/satellite";
                        this.chkAcceptConfig.UseVisualStyleBackColor = true;
-                       //
+                       // 
                        // chkAcceptCommands
-                       //
+                       // 
                        this.chkAcceptCommands.AutoSize = true;
                        this.chkAcceptCommands.Location = new System.Drawing.Point(9, 19);
                        this.chkAcceptCommands.Name = "chkAcceptCommands";
-                       this.chkAcceptCommands.Size = new System.Drawing.Size(171, 17);
+                       this.chkAcceptCommands.Size = new System.Drawing.Size(211, 17);
                        this.chkAcceptCommands.TabIndex = 0;
-                       this.chkAcceptCommands.Text = "Accept commands from master";
+                       this.chkAcceptCommands.Text = "Accept commands from master/satellite";
                        this.chkAcceptCommands.UseVisualStyleBackColor = true;
-                       //
+                       // 
                        // txtTicket
-                       //
-                       this.txtTicket.Location = new System.Drawing.Point(98, 45);
+                       // 
+                       this.txtTicket.Location = new System.Drawing.Point(144, 45);
                        this.txtTicket.Name = "txtTicket";
-                       this.txtTicket.Size = new System.Drawing.Size(340, 20);
+                       this.txtTicket.Size = new System.Drawing.Size(459, 20);
                        this.txtTicket.TabIndex = 1;
-                       //
+                       // 
                        // lblTicket
-                       //
+                       // 
                        this.lblTicket.AutoSize = true;
                        this.lblTicket.Location = new System.Drawing.Point(9, 48);
                        this.lblTicket.Name = "lblTicket";
-                       this.lblTicket.Size = new System.Drawing.Size(71, 13);
+                       this.lblTicket.Size = new System.Drawing.Size(117, 13);
                        this.lblTicket.TabIndex = 4;
-                       this.lblTicket.Text = "Setup Ticket:";
-                       //
+                       this.lblTicket.Text = "Setup Ticket (optional):";
+                       // 
                        // txtInstanceName
-                       //
-                       this.txtInstanceName.Location = new System.Drawing.Point(98, 16);
+                       // 
+                       this.txtInstanceName.Location = new System.Drawing.Point(144, 16);
                        this.txtInstanceName.Name = "txtInstanceName";
-                       this.txtInstanceName.Size = new System.Drawing.Size(340, 20);
+                       this.txtInstanceName.Size = new System.Drawing.Size(459, 20);
                        this.txtInstanceName.TabIndex = 0;
-                       //
+                       // 
                        // lblInstanceName
-                       //
+                       // 
                        this.lblInstanceName.AutoSize = true;
                        this.lblInstanceName.Location = new System.Drawing.Point(9, 20);
                        this.lblInstanceName.Name = "lblInstanceName";
-                       this.lblInstanceName.Size = new System.Drawing.Size(82, 13);
+                       this.lblInstanceName.Size = new System.Drawing.Size(121, 13);
                        this.lblInstanceName.TabIndex = 3;
-                       this.lblInstanceName.Text = "Instance Name:";
-                       //
+                       this.lblInstanceName.Text = "Instance Name (FQDN):";
+                       // 
                        // groupBox2
-                       //
+                       // 
                        this.groupBox2.Controls.Add(this.rdoNoListener);
                        this.groupBox2.Controls.Add(this.txtListenerPort);
                        this.groupBox2.Controls.Add(this.lblListenerPort);
                        this.groupBox2.Controls.Add(this.rdoListener);
-                       this.groupBox2.Location = new System.Drawing.Point(8, 359);
+                       this.groupBox2.Location = new System.Drawing.Point(12, 291);
                        this.groupBox2.Name = "groupBox2";
-                       this.groupBox2.Size = new System.Drawing.Size(294, 135);
+                       this.groupBox2.Size = new System.Drawing.Size(294, 188);
                        this.groupBox2.TabIndex = 2;
                        this.groupBox2.TabStop = false;
                        this.groupBox2.Text = "TCP Listener";
-                       //
+                       // 
                        // rdoNoListener
-                       //
+                       // 
                        this.rdoNoListener.AutoSize = true;
                        this.rdoNoListener.Checked = true;
                        this.rdoNoListener.Location = new System.Drawing.Point(11, 82);
@@ -314,130 +312,113 @@
                        this.rdoNoListener.Text = "Do not listen for connections.";
                        this.rdoNoListener.UseVisualStyleBackColor = true;
                        this.rdoNoListener.CheckedChanged += new System.EventHandler(this.RadioListener_CheckedChanged);
-                       //
+                       // 
                        // txtListenerPort
-                       //
+                       // 
                        this.txtListenerPort.Enabled = false;
                        this.txtListenerPort.Location = new System.Drawing.Point(132, 51);
                        this.txtListenerPort.Name = "txtListenerPort";
                        this.txtListenerPort.Size = new System.Drawing.Size(84, 20);
                        this.txtListenerPort.TabIndex = 8;
                        this.txtListenerPort.Text = "5665";
-                       //
+                       // 
                        // lblListenerPort
-                       //
+                       // 
                        this.lblListenerPort.AutoSize = true;
                        this.lblListenerPort.Location = new System.Drawing.Point(43, 55);
                        this.lblListenerPort.Name = "lblListenerPort";
                        this.lblListenerPort.Size = new System.Drawing.Size(29, 13);
                        this.lblListenerPort.TabIndex = 1;
                        this.lblListenerPort.Text = "Port:";
-                       //
+                       // 
                        // rdoListener
-                       //
+                       // 
                        this.rdoListener.AutoSize = true;
                        this.rdoListener.Location = new System.Drawing.Point(11, 24);
                        this.rdoListener.Name = "rdoListener";
-                       this.rdoListener.Size = new System.Drawing.Size(250, 17);
+                       this.rdoListener.Size = new System.Drawing.Size(247, 17);
                        this.rdoListener.TabIndex = 7;
-                       this.rdoListener.Text = "Listen for connections from the master instance:";
+                       this.rdoListener.Text = "Listen for connections from the master/satellite:";
                        this.rdoListener.UseVisualStyleBackColor = true;
                        this.rdoListener.CheckedChanged += new System.EventHandler(this.RadioListener_CheckedChanged);
-                       //
+                       // 
                        // groupBox1
-                       //
+                       // 
                        this.groupBox1.Controls.Add(this.btnEditEndpoint);
                        this.groupBox1.Controls.Add(this.btnRemoveEndpoint);
                        this.groupBox1.Controls.Add(this.btnAddEndpoint);
                        this.groupBox1.Controls.Add(this.lvwEndpoints);
-                       this.groupBox1.Controls.Add(this.rdoNoMaster);
-                       this.groupBox1.Controls.Add(this.rdoNewMaster);
                        this.groupBox1.Location = new System.Drawing.Point(8, 77);
                        this.groupBox1.Name = "groupBox1";
-                       this.groupBox1.Size = new System.Drawing.Size(601, 276);
+                       this.groupBox1.Size = new System.Drawing.Size(601, 208);
                        this.groupBox1.TabIndex = 1;
                        this.groupBox1.TabStop = false;
-                       this.groupBox1.Text = "Master Instance";
-                       //
+                       this.groupBox1.Text = "Master/Satellite Instance(s)";
+                       // 
+                       // btnEditEndpoint
+                       // 
+                       this.btnEditEndpoint.Enabled = false;
+                       this.btnEditEndpoint.Location = new System.Drawing.Point(520, 48);
+                       this.btnEditEndpoint.Name = "btnEditEndpoint";
+                       this.btnEditEndpoint.Size = new System.Drawing.Size(75, 23);
+                       this.btnEditEndpoint.TabIndex = 7;
+                       this.btnEditEndpoint.Text = "Edit";
+                       this.btnEditEndpoint.UseVisualStyleBackColor = true;
+                       this.btnEditEndpoint.Click += new System.EventHandler(this.btnEditEndpoint_Click);
+                       // 
                        // btnRemoveEndpoint
-                       //
+                       // 
                        this.btnRemoveEndpoint.Enabled = false;
-                       this.btnRemoveEndpoint.Location = new System.Drawing.Point(520, 141);
+                       this.btnRemoveEndpoint.Location = new System.Drawing.Point(520, 77);
                        this.btnRemoveEndpoint.Name = "btnRemoveEndpoint";
                        this.btnRemoveEndpoint.Size = new System.Drawing.Size(75, 23);
                        this.btnRemoveEndpoint.TabIndex = 6;
                        this.btnRemoveEndpoint.Text = "Remove";
                        this.btnRemoveEndpoint.UseVisualStyleBackColor = true;
                        this.btnRemoveEndpoint.Click += new System.EventHandler(this.btnRemoveEndpoint_Click);
-                       //
+                       // 
                        // btnAddEndpoint
-                       //
-                       this.btnAddEndpoint.Location = new System.Drawing.Point(520, 83);
+                       // 
+                       this.btnAddEndpoint.Location = new System.Drawing.Point(520, 19);
                        this.btnAddEndpoint.Name = "btnAddEndpoint";
                        this.btnAddEndpoint.Size = new System.Drawing.Size(75, 23);
                        this.btnAddEndpoint.TabIndex = 5;
                        this.btnAddEndpoint.Text = "Add";
                        this.btnAddEndpoint.UseVisualStyleBackColor = true;
                        this.btnAddEndpoint.Click += new System.EventHandler(this.btnAddEndpoint_Click);
-                       //
+                       // 
                        // lvwEndpoints
-                       //
+                       // 
                        this.lvwEndpoints.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
                        this.colInstanceName,
                        this.colHost,
                        this.colPort});
                        this.lvwEndpoints.FullRowSelect = true;
-                       this.lvwEndpoints.Location = new System.Drawing.Point(11, 83);
+                       this.lvwEndpoints.Location = new System.Drawing.Point(11, 19);
                        this.lvwEndpoints.Name = "lvwEndpoints";
                        this.lvwEndpoints.Size = new System.Drawing.Size(500, 176);
                        this.lvwEndpoints.TabIndex = 4;
                        this.lvwEndpoints.UseCompatibleStateImageBehavior = false;
                        this.lvwEndpoints.View = System.Windows.Forms.View.Details;
                        this.lvwEndpoints.SelectedIndexChanged += new System.EventHandler(this.lvwEndpoints_SelectedIndexChanged);
-                       //
+                       // 
                        // colInstanceName
-                       //
+                       // 
                        this.colInstanceName.Text = "Instance Name";
                        this.colInstanceName.Width = 200;
-                       //
+                       // 
                        // colHost
-                       //
+                       // 
                        this.colHost.Text = "Host";
                        this.colHost.Width = 200;
-                       //
+                       // 
                        // colPort
-                       //
+                       // 
                        this.colPort.Text = "Port";
                        this.colPort.Width = 80;
-                       //
-                       // rdoNoMaster
-                       //
-                       this.rdoNoMaster.AutoSize = true;
-                       this.rdoNoMaster.Checked = true;
-                       this.rdoNoMaster.Location = new System.Drawing.Point(11, 50);
-                       this.rdoNoMaster.Name = "rdoNoMaster";
-                       this.rdoNoMaster.Size = new System.Drawing.Size(374, 17);
-                       this.rdoNoMaster.TabIndex = 3;
-                       this.rdoNoMaster.TabStop = true;
-                       this.rdoNoMaster.Text = "This instance should report its check results to an existing Icinga 2 master:";
-                       this.rdoNoMaster.UseVisualStyleBackColor = true;
-                       this.rdoNoMaster.CheckedChanged += new System.EventHandler(this.RadioMaster_CheckedChanged);
-                       //
-                       // rdoNewMaster
-                       //
-                       this.rdoNewMaster.AutoSize = true;
-                       this.rdoNewMaster.Enabled = false;
-                       this.rdoNewMaster.Location = new System.Drawing.Point(11, 22);
-                       this.rdoNewMaster.Name = "rdoNewMaster";
-                       this.rdoNewMaster.Size = new System.Drawing.Size(167, 17);
-                       this.rdoNewMaster.TabIndex = 2;
-                       this.rdoNewMaster.TabStop = true;
-                       this.rdoNewMaster.Text = "This is a new master instance.";
-                       this.rdoNewMaster.UseVisualStyleBackColor = true;
-                       this.rdoNewMaster.CheckedChanged += new System.EventHandler(this.RadioMaster_CheckedChanged);
-                       //
+                       // 
                        // tbcPages
-                       //
+                       // 
                        this.tbcPages.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
                        this.tbcPages.Controls.Add(this.tabParameters);
                        this.tbcPages.Controls.Add(this.tabRetrieveCertificate);
@@ -454,9 +435,9 @@
                        this.tbcPages.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
                        this.tbcPages.TabIndex = 0;
                        this.tbcPages.SelectedIndexChanged += new System.EventHandler(this.tbcPages_SelectedIndexChanged);
-                       //
+                       // 
                        // tabRetrieveCertificate
-                       //
+                       // 
                        this.tabRetrieveCertificate.Controls.Add(this.lblRetrieveCertificate);
                        this.tabRetrieveCertificate.Controls.Add(this.prgRetrieveCertificate);
                        this.tabRetrieveCertificate.Location = new System.Drawing.Point(4, 5);
@@ -466,25 +447,25 @@
                        this.tabRetrieveCertificate.TabIndex = 7;
                        this.tabRetrieveCertificate.Text = "Checking Certificate";
                        this.tabRetrieveCertificate.UseVisualStyleBackColor = true;
-                       //
+                       // 
                        // lblRetrieveCertificate
-                       //
+                       // 
                        this.lblRetrieveCertificate.AutoSize = true;
                        this.lblRetrieveCertificate.Location = new System.Drawing.Point(164, 229);
                        this.lblRetrieveCertificate.Name = "lblRetrieveCertificate";
                        this.lblRetrieveCertificate.Size = new System.Drawing.Size(110, 13);
                        this.lblRetrieveCertificate.TabIndex = 3;
                        this.lblRetrieveCertificate.Text = "Checking certificate...";
-                       //
+                       // 
                        // prgRetrieveCertificate
-                       //
+                       // 
                        this.prgRetrieveCertificate.Location = new System.Drawing.Point(164, 248);
                        this.prgRetrieveCertificate.Name = "prgRetrieveCertificate";
                        this.prgRetrieveCertificate.Size = new System.Drawing.Size(289, 23);
                        this.prgRetrieveCertificate.TabIndex = 2;
-                       //
+                       // 
                        // tabVerifyCertificate
-                       //
+                       // 
                        this.tabVerifyCertificate.Controls.Add(this.grpX509Fields);
                        this.tabVerifyCertificate.Controls.Add(this.txtX509Subject);
                        this.tabVerifyCertificate.Controls.Add(this.txtX509Issuer);
@@ -498,9 +479,9 @@
                        this.tabVerifyCertificate.TabIndex = 6;
                        this.tabVerifyCertificate.Text = "Verify Certificate";
                        this.tabVerifyCertificate.UseVisualStyleBackColor = true;
-                       //
+                       // 
                        // grpX509Fields
-                       //
+                       // 
                        this.grpX509Fields.Controls.Add(this.txtX509Field);
                        this.grpX509Fields.Controls.Add(this.lvwX509Fields);
                        this.grpX509Fields.Location = new System.Drawing.Point(11, 115);
@@ -509,9 +490,9 @@
                        this.grpX509Fields.TabIndex = 8;
                        this.grpX509Fields.TabStop = false;
                        this.grpX509Fields.Text = "X509 Fields";
-                       //
+                       // 
                        // txtX509Field
-                       //
+                       // 
                        this.txtX509Field.Font = new System.Drawing.Font("Courier New", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
                        this.txtX509Field.Location = new System.Drawing.Point(6, 197);
                        this.txtX509Field.Multiline = true;
@@ -520,9 +501,9 @@
                        this.txtX509Field.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
                        this.txtX509Field.Size = new System.Drawing.Size(586, 166);
                        this.txtX509Field.TabIndex = 9;
-                       //
+                       // 
                        // lvwX509Fields
-                       //
+                       // 
                        this.lvwX509Fields.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
                        this.colField,
                        this.colValue});
@@ -533,62 +514,62 @@
                        this.lvwX509Fields.UseCompatibleStateImageBehavior = false;
                        this.lvwX509Fields.View = System.Windows.Forms.View.Details;
                        this.lvwX509Fields.SelectedIndexChanged += new System.EventHandler(this.lvwX509Fields_SelectedIndexChanged);
-                       //
+                       // 
                        // colField
-                       //
+                       // 
                        this.colField.Text = "Field";
                        this.colField.Width = 200;
-                       //
+                       // 
                        // colValue
-                       //
+                       // 
                        this.colValue.Text = "Value";
                        this.colValue.Width = 350;
-                       //
+                       // 
                        // txtX509Subject
-                       //
+                       // 
                        this.txtX509Subject.Location = new System.Drawing.Point(71, 73);
                        this.txtX509Subject.Name = "txtX509Subject";
                        this.txtX509Subject.ReadOnly = true;
                        this.txtX509Subject.Size = new System.Drawing.Size(532, 20);
                        this.txtX509Subject.TabIndex = 4;
-                       //
+                       // 
                        // txtX509Issuer
-                       //
+                       // 
                        this.txtX509Issuer.Location = new System.Drawing.Point(71, 47);
                        this.txtX509Issuer.Name = "txtX509Issuer";
                        this.txtX509Issuer.ReadOnly = true;
                        this.txtX509Issuer.Size = new System.Drawing.Size(532, 20);
                        this.txtX509Issuer.TabIndex = 3;
-                       //
+                       // 
                        // lblX509Subject
-                       //
+                       // 
                        this.lblX509Subject.AutoSize = true;
                        this.lblX509Subject.Location = new System.Drawing.Point(8, 77);
                        this.lblX509Subject.Name = "lblX509Subject";
                        this.lblX509Subject.Size = new System.Drawing.Size(46, 13);
                        this.lblX509Subject.TabIndex = 2;
                        this.lblX509Subject.Text = "Subject:";
-                       //
+                       // 
                        // lblX509Issuer
-                       //
+                       // 
                        this.lblX509Issuer.AutoSize = true;
                        this.lblX509Issuer.Location = new System.Drawing.Point(8, 50);
                        this.lblX509Issuer.Name = "lblX509Issuer";
                        this.lblX509Issuer.Size = new System.Drawing.Size(38, 13);
                        this.lblX509Issuer.TabIndex = 1;
                        this.lblX509Issuer.Text = "Issuer:";
-                       //
+                       // 
                        // lblX509Prompt
-                       //
+                       // 
                        this.lblX509Prompt.AutoSize = true;
                        this.lblX509Prompt.Location = new System.Drawing.Point(8, 15);
                        this.lblX509Prompt.Name = "lblX509Prompt";
                        this.lblX509Prompt.Size = new System.Drawing.Size(201, 13);
                        this.lblX509Prompt.TabIndex = 0;
                        this.lblX509Prompt.Text = "Please verify the master\'s SSL certificate:";
-                       //
+                       // 
                        // tabError
-                       //
+                       // 
                        this.tabError.Controls.Add(this.txtError);
                        this.tabError.Controls.Add(this.lblError);
                        this.tabError.Location = new System.Drawing.Point(4, 5);
@@ -598,9 +579,9 @@
                        this.tabError.TabIndex = 8;
                        this.tabError.Text = "Error";
                        this.tabError.UseVisualStyleBackColor = true;
-                       //
+                       // 
                        // txtError
-                       //
+                       // 
                        this.txtError.Font = new System.Drawing.Font("Courier New", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
                        this.txtError.Location = new System.Drawing.Point(11, 38);
                        this.txtError.Multiline = true;
@@ -609,38 +590,27 @@
                        this.txtError.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
                        this.txtError.Size = new System.Drawing.Size(598, 397);
                        this.txtError.TabIndex = 1;
-                       //
+                       // 
                        // lblError
-                       //
+                       // 
                        this.lblError.AutoSize = true;
                        this.lblError.Location = new System.Drawing.Point(8, 12);
                        this.lblError.Name = "lblError";
                        this.lblError.Size = new System.Drawing.Size(209, 13);
                        this.lblError.TabIndex = 0;
                        this.lblError.Text = "An error occurred while setting up Icinga 2:";
-                       //
+                       // 
                        // picBanner
-                       //
+                       // 
                        this.picBanner.Image = global::Icinga.Properties.Resources.icinga_banner;
                        this.picBanner.Location = new System.Drawing.Point(0, 0);
                        this.picBanner.Name = "picBanner";
                        this.picBanner.Size = new System.Drawing.Size(625, 77);
                        this.picBanner.TabIndex = 1;
                        this.picBanner.TabStop = false;
-                       //
-                       // btnEditEndpoint
-                       //
-                       this.btnEditEndpoint.Enabled = false;
-                       this.btnEditEndpoint.Location = new System.Drawing.Point(520, 112);
-                       this.btnEditEndpoint.Name = "btnEditEndpoint";
-                       this.btnEditEndpoint.Size = new System.Drawing.Size(75, 23);
-                       this.btnEditEndpoint.TabIndex = 7;
-                       this.btnEditEndpoint.Text = "Edit";
-                       this.btnEditEndpoint.UseVisualStyleBackColor = true;
-                       this.btnEditEndpoint.Click += new System.EventHandler(this.btnEditEndpoint_Click);
-                       //
+                       // 
                        // SetupWizard
-                       //
+                       // 
                        this.AcceptButton = this.btnNext;
                        this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
                        this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -667,7 +637,6 @@
                        this.groupBox2.ResumeLayout(false);
                        this.groupBox2.PerformLayout();
                        this.groupBox1.ResumeLayout(false);
-                       this.groupBox1.PerformLayout();
                        this.tbcPages.ResumeLayout(false);
                        this.tabRetrieveCertificate.ResumeLayout(false);
                        this.tabRetrieveCertificate.PerformLayout();
@@ -707,8 +676,6 @@
                private System.Windows.Forms.ListView lvwEndpoints;
                private System.Windows.Forms.ColumnHeader colHost;
                private System.Windows.Forms.ColumnHeader colPort;
-               private System.Windows.Forms.RadioButton rdoNoMaster;
-               private System.Windows.Forms.RadioButton rdoNewMaster;
                private System.Windows.Forms.TabControl tbcPages;
                private System.Windows.Forms.TabPage tabVerifyCertificate;
                private System.Windows.Forms.Label lblX509Prompt;

diff --git a/agent/windows-setup-agent/SetupWizard.cs b/agent/windows-setup-agent/SetupWizard.cs
index 418a8516b24a41f58f4c50d18b8ad021c7443958..37633f15bc930546b4bfb9fd410332ac61acd7de 100644 (file)
--- a/agent/windows-setup-agent/SetupWizard.cs
+++ b/agent/windows-setup-agent/SetupWizard.cs
@@ -189,9 +189,6 @@ namespace Icinga
 
                        string args = "";
 
-                       if (rdoNewMaster.Checked)
-                               args += " --master";
-
                        Invoke((MethodInvoker)delegate
                        {
                                string master_host, master_port;
@@ -216,7 +213,9 @@ namespace Icinga
                        if (chkAcceptCommands.Checked)
                                args += " --accept-commands";
 
-                       args += " --ticket \"" + txtTicket.Text + "\"";
+                       if (txtTicket.Text != "")
+                               args += " --ticket \"" + txtTicket.Text + "\"";
+
                        args += " --trustedcert \"" + _TrustedFile + "\"";
                        args += " --cn \"" + txtInstanceName.Text + "\"";
                        args += " --zone \"" + txtInstanceName.Text + "\"";
@@ -311,22 +310,15 @@ namespace Icinga
                                        return;
                                }
 
-                               if (txtTicket.Text.Length == 0) {
-                                       Warning("Please enter an agent ticket.");
+                               if (lvwEndpoints.Items.Count == 0) {
+                                       Warning("You need to add at least one master/satellite endpoint.");
                                        return;
                                }
 
-                               if (rdoNoMaster.Checked) {
-                                       if (lvwEndpoints.Items.Count == 0) {
-                                               Warning("You need to add at least one master endpoint.");
-                                               return;
-                                       }
-
-                                       string host, port;
-                                       if (!GetMasterHostPort(out host, out port)) {
-                                               Warning("Please enter a remote host and port for at least one of your endpoints.");
-                                               return;
-                                       }
+                               string host, port;
+                               if (!GetMasterHostPort(out host, out port)) {
+                                       Warning("Please enter a remote host and port for at least one of your endpoints.");
+                                       return;
                                }
 
                                if (rdoListener.Checked && (txtListenerPort.Text == "")) {
@@ -335,7 +327,7 @@ namespace Icinga
                                }
 
                                if (txtUser.Text.Length == 0) {
-                                       Warning("Icinga2 user may not be empty.");
+                                       Warning("Icinga 2 user may not be empty.");
                                        return;
                                }
                        }
@@ -373,35 +365,12 @@ namespace Icinga
                                thread.Start();
                        }
 
-                       /*if (tbcPages.SelectedTab == tabParameters &&
-                               !File.Exists(Icinga2DataDir + "\\etc\\icinga2\\pki\\agent\\agent.crt")) {
-                               byte[] bytes = Convert.FromBase64String(txtBundle.Text);
-                               MemoryStream ms = new MemoryStream(bytes);
-                               GZipStream gz = new GZipStream(ms, CompressionMode.Decompress);
-                               MemoryStream ms2 = new MemoryStream();
-
-                               byte[] buffer = new byte[512];
-                               int rc;
-                               while ((rc = gz.Read(buffer, 0, buffer.Length)) > 0)
-                                       ms2.Write(buffer, 0, rc);
-                               ms2.Position = 0;
-                               TarReader tr = new TarReader(ms2);
-                               tr.ReadToEnd(Icinga2DataDir + "\\etc\\icinga2\\pki\\agent");
-                       }*/
-
                        if (tbcPages.SelectedTab == tabConfigure) {
                                Thread thread = new Thread(ConfigureService);
                                thread.Start();
                        }
                }
 
-               private void RadioMaster_CheckedChanged(object sender, EventArgs e)
-               {
-                       lvwEndpoints.Enabled = !rdoNewMaster.Checked;
-                       btnAddEndpoint.Enabled = !rdoNewMaster.Checked;
-                       btnRemoveEndpoint.Enabled = !rdoNewMaster.Checked && lvwEndpoints.SelectedItems.Count > 0;
-               }
-
                private void RadioListener_CheckedChanged(object sender, EventArgs e)
                {
                        txtListenerPort.Enabled = rdoListener.Checked;