From 6b5d5160c094bf3f0c7a9cb83bda1a8c5c5a8922 Mon Sep 17 00:00:00 2001 From: Marco Pfatschbacher Date: Wed, 6 Mar 2019 13:01:18 +0100 Subject: [PATCH] Default the windows installer to an empty nodename (#347) It's a better default to use the system's hostname. Fixes #339 (cherry picked from commit 5472b0d581af64862c33100e4a15c126ee233bdb) --- dist/recipe.nsi | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dist/recipe.nsi b/dist/recipe.nsi index d568b4b..581e543 100644 --- a/dist/recipe.nsi +++ b/dist/recipe.nsi @@ -292,14 +292,16 @@ Function nsDialogsPage ${NSD_CreateText} 50 20 75% 12u "http://127.0.0.1:9000/api" Pop $InputServerUrl - ${NSD_CreateLabel} 0 60 100% 12u "Enter the name of this instance:" + ${NSD_CreateLabel} 0 60 100% 12u "The name of this instance:" Pop $Label - ${NSD_CreateText} 50 80 75% 12u "graylog-sidecar" + ${NSD_CreateText} 50 80 75% 12u "" Pop $InputNodeName + ${NSD_CreateLabel} 50 100 100% 12u "If empty, the hostname will be used." + Pop $Label - ${NSD_CreateLabel} 0 120 100% 12u "Enter the server API token:" + ${NSD_CreateLabel} 0 140 100% 12u "Enter the server API token:" Pop $Label - ${NSD_CreateText} 50 140 75% 12u "" + ${NSD_CreateText} 50 160 75% 12u "" Pop $InputApiToken nsDialogs::Show @@ -314,10 +316,6 @@ Function nsDialogsPageLeave MessageBox MB_OK "Please enter a valid address to your Graylog server!" Abort ${EndIf} - ${If} $NodeName == "" - MessageBox MB_OK "Please enter the instance name!" - Abort - ${EndIf} ${If} $ApiToken == "" MessageBox MB_OK "Please enter an API token!" Abort