mirror of
https://github.com/unrealircd/unrealircd.git
synced 2026-07-07 20:23:12 +02:00
Remove 'make encpem'. Nobody uses this as it would mean you always need
to enter the private key password when UnrealIRCd is (re)started. Similarly, remove all references to it on Windows as well, where people thought clicking "Encrypt private key" was a good idea. Can't blame them, it sounds good on first sight :D [skip ci]
This commit is contained in:
-11
@@ -261,17 +261,6 @@ pem: src/ssl.cnf
|
||||
@echo "Setting o-rwx & g-rwx for files... "
|
||||
chmod o-rwx server.req.pem server.key.pem server.cert.pem
|
||||
chmod g-rwx server.req.pem server.key.pem server.cert.pem
|
||||
@echo "Done!. If you want to encrypt the private key, run"
|
||||
@echo "make encpem"
|
||||
|
||||
encpem: server.key.pem
|
||||
@echo "Encrypting server key .."
|
||||
$(OPENSSLPATH) rsa -in server.key.pem -out server.key.c.pem -des3
|
||||
-@if [ -f server.key.c.pem ] ; then \
|
||||
echo "Replacing unencrypted with encrypted .." ; \
|
||||
cp server.key.c.pem server.key.pem ; \
|
||||
rm -f server.key.c.pem ; \
|
||||
fi
|
||||
|
||||
Makefile: config.status Makefile.in
|
||||
./config.status
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
@title Encrypting server private key
|
||||
SET OPENSSL_CONF=ssl.cnf
|
||||
openssl rsa -in conf/ssl/server.key.pem -out conf/ssl/server.key.c.pem -des3
|
||||
copy conf/ssl/server.key.c.pem conf/ssl/server.key.pem
|
||||
@@ -33,7 +33,6 @@ Name: "installservice/startboot"; Description: "S&tart UnrealIRCd when Windows s
|
||||
Name: "installservice/startdemand"; Description: "Start UnrealIRCd on &request"; GroupDescription: "Service support:"; MinVersion: 0,4.0; Flags: exclusive unchecked
|
||||
Name: "installservice/crashrestart"; Description: "Restart UnrealIRCd if it &crashes"; GroupDescription: "Service support:"; Flags: unchecked; MinVersion: 0,5.0;
|
||||
Name: "makecert"; Description: "&Create certificate"; GroupDescription: "SSL options:";
|
||||
Name: "enccert"; Description: "&Encrypt certificate"; GroupDescription: "SSL options:"; Flags: unchecked;
|
||||
Name: "fixperm"; Description: "Make UnrealIRCd folder writable by current user";
|
||||
|
||||
[Files]
|
||||
@@ -60,7 +59,6 @@ Source: "doc\conf\aliases\*"; DestDir: "{app}\conf\aliases"; Flags: ignoreversio
|
||||
Source: "unrealsvc.exe"; DestDir: "{app}"; Flags: ignoreversion; MinVersion: 0,4.0
|
||||
|
||||
Source: "src\win32\makecert.bat"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "src\win32\encpem.bat"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "src\ssl.cnf"; DestDir: "{app}"; Flags: ignoreversion
|
||||
|
||||
Source: "src\modules\*.dll"; DestDir: "{app}\modules"; Flags: ignoreversion
|
||||
@@ -120,32 +118,6 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
function NextButtonClick(CurPage: Integer): Boolean;
|
||||
|
||||
var
|
||||
hWnd: Integer;
|
||||
ResultCode: Integer;
|
||||
ResultXP: boolean;
|
||||
Result2003: boolean;
|
||||
Res: Integer;
|
||||
begin
|
||||
|
||||
Result := true;
|
||||
ResultXP := true;
|
||||
Result2003 := true;
|
||||
|
||||
// Prevent the user from selecting both 'Install as service' and 'Encrypt SSL certificate'
|
||||
if CurPage = wpSelectTasks then
|
||||
begin
|
||||
if IsTaskSelected('enccert') and IsTaskSelected('installservice') then
|
||||
begin
|
||||
MsgBox('When running UnrealIRCd as a service there is no way to enter the password for an encrypted SSL certificate, therefore you cannot combine the two. Please deselect one of the options.', mbError, MB_OK);
|
||||
Result := False
|
||||
end
|
||||
end;
|
||||
|
||||
end;
|
||||
|
||||
procedure CurStepChanged(CurStep: TSetupStep);
|
||||
|
||||
var
|
||||
@@ -197,7 +169,6 @@ end;
|
||||
Name: "{group}\UnrealIRCd"; Filename: "{app}\UnrealIRCd.exe"; WorkingDir: "{app}"
|
||||
Name: "{group}\Uninstall UnrealIRCd"; Filename: "{uninstallexe}"; WorkingDir: "{app}"
|
||||
Name: "{group}\Make Certificate"; Filename: "{app}\makecert.bat"; WorkingDir: "{app}"
|
||||
Name: "{group}\Encrypt Certificate"; Filename: "{app}\encpem.bat"; WorkingDir: "{app}"
|
||||
Name: "{group}\Documentation"; Filename: "https://www.unrealircd.org/docs/UnrealIRCd_4_documentation"; WorkingDir: "{app}"
|
||||
Name: "{userdesktop}\UnrealIRCd"; Filename: "{app}\UnrealIRCd.exe"; WorkingDir: "{app}"; Tasks: desktopicon
|
||||
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\UnrealIRCd"; Filename: "{app}\UnrealIRCd.exe"; WorkingDir: "{app}"; Tasks: quicklaunchicon
|
||||
@@ -212,7 +183,6 @@ Filename: "{app}\unrealsvc.exe"; Parameters: "config startup manual"; Flags: run
|
||||
Filename: "{app}\unrealsvc.exe"; Parameters: "config startup auto"; Flags: runminimized nowait; Tasks: installservice/startboot
|
||||
Filename: "{app}\unrealsvc.exe"; Parameters: "config crashrestart 2"; Flags: runminimized nowait; Tasks: installservice/crashrestart
|
||||
Filename: "{app}\makecert.bat"; Tasks: makecert; Flags: postinstall;
|
||||
Filename: "{app}\encpem.bat"; WorkingDir: "{app}"; Tasks: enccert; Flags: postinstall;
|
||||
|
||||
[UninstallRun]
|
||||
Filename: "{app}\unrealsvc.exe"; Parameters: "uninstall"; Flags: runminimized; RunOnceID: "DelService"; Tasks: installservice
|
||||
|
||||
Reference in New Issue
Block a user