From bcb97efdb328d8841be3160a18d56d2657ace1ca Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Wed, 29 Dec 2010 16:29:19 +0000 Subject: [PATCH] - Windows installer: if an SSL certificate already exists, then don't check the 'create SSL certificate' by default. Patch from goldenwolf (#3965). --- Changes | 2 ++ src/win32/unrealinst.iss | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index 7c997adfc..376b53a59 100644 --- a/Changes +++ b/Changes @@ -2258,3 +2258,5 @@ - Fix remote MOTDs for URLs whose path components contain subdirectories, in the process much simplifying my remote MOTD code. Reported by goldenwolf (#3986). +- Windows installer: if an SSL certificate already exists, then don't check + the 'create SSL certificate' by default. Patch from goldenwolf (#3965). diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss index 2c4498a0b..3c23d0270 100644 --- a/src/win32/unrealinst.iss +++ b/src/win32/unrealinst.iss @@ -30,6 +30,7 @@ SolidCompression=true MinVersion=4.0.1111,4.0.1381 OutputDir=../../ +; !!! Make sure to update SSL validation (WizardForm.TasksList.Checked[9]) if tasks are added/removed !!! [Tasks] Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:" Name: "quicklaunchicon"; Description: "Create a &Quick Launch icon"; GroupDescription: "Additional icons:"; Flags: unchecked @@ -290,6 +291,21 @@ if CurStep = ssPostInstall then end; end; +//********************************************************************************* +// Checks if ssl cert file exists +//********************************************************************************* + +#ifdef USE_SSL +procedure CurPageChanged(CurPage: Integer); +begin + if (CurPage = wpSelectTasks)then begin + if not FileExists(ExpandConstant('{app}\server.cert.pem')) then begin + WizardForm.TasksList.Checked[9]:=true; + end; + end; +end; +#endif + [Icons] Name: "{group}\UnrealIRCd"; Filename: "{app}\wircd.exe"; WorkingDir: "{app}" Name: "{group}\Uninstall UnrealIRCd"; Filename: "{uninstallexe}"; WorkingDir: "{app}" @@ -317,4 +333,3 @@ Filename: "{app}\encpem.bat"; WorkingDir: "{app}"; Tasks: enccert; Flags: postin [UninstallRun] Filename: "{app}\unreal.exe"; Parameters: "uninstall"; Flags: runminimized; RunOnceID: "DelService"; Tasks: installservice -