# HG changeset patch
# User Oliver Maurhart <oliver.maurhart@ait.ac.at>
# Date 1412075197 -7200
# Node ID cab995223c76332e912909940dbc4f1b83893eac
# Parent  d2d4421e42ed6cae7c0c32c5c41c82675bd329a0
request browser and log server during setup

diff -r d2d4421e42ed -r cab995223c76 OpenSecurity.iss
--- a/OpenSecurity.iss	Tue Sep 30 11:48:14 2014 +0200
+++ b/OpenSecurity.iss	Tue Sep 30 13:06:37 2014 +0200
@@ -3,7 +3,6 @@
 ; Inno Setup Compiler (http://www.jrsoftware.org/isinfo.php) 
 
 [Setup]
-; Basic installation stuff and config
 AppName=OpenSecurity
 AppContact=AIT Austrian Institute of Technology
 AppPublisher=AIT Austrian Institute of Technology
@@ -26,7 +25,6 @@
 UninstallDisplayIcon={app}\bin\ui\gfx\OpenSecurity.ico
 
 [Files]
-; Files to copy
 Source: "OpenSecurity\bin\*"; Excludes: "*.pyc,*.swp"; DestDir: "{app}\bin"; Flags: recursesubdirs createallsubdirs;
 Source: "OpenSecurity\cygwin64\*"; DestDir: "{app}\cygwin64"; Flags: recursesubdirs createallsubdirs;
 Source: "OpenSecurity\install\*"; DestDir: "{app}\install"; Flags: recursesubdirs createallsubdirs;
@@ -42,20 +40,18 @@
 Name: "{app}\log"; Permissions: everyone-modify
 
 [Registry]
-; Registry entries to set
 Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueName: "OpenSecurity Tray Icon"; ValueType: string; ValueData: "{app}\python27\pythonw.exe ""{app}\bin\opensecurity_tray.pyw"""; Flags: uninsdeletevalue
-Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "LogServerUrl"; ValueType: string; ValueData: "http://10.215.5.166/opensecurity/log"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "LogServerUrl"; ValueType: string; ValueData: "{code:URLLogServer}"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "Browser"; ValueType: string; ValueData: "{code:VMBrowser}"; Flags: uninsdeletevalue
 Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\services\USBSTOR"; ValueName: "Start"; ValueType: dword; ValueData: 4;
 
 [Icons]
-; Program Icons in start menu
 Name: "{group}\OpenSecurity Tray Icon"; Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_tray.pyw"""; WorkingDir: "{userappdata}"; Comment: "The OpenSecurity Tray Icon"; IconFilename: "{app}\bin\ui\gfx\OpenSecurity.ico"
 Name: "{group}\Secure Browsing"; Filename: "{app}\cygiwn64\bin\wget.exe"; Parameters: """http://localhost:8080/browsing"""; WorkingDir: "{userappdata}"; Comment: "OpenSecurity Secure Browsing"; IconFilename: "{app}\bin\ui\gfx\opensecurity_browsing_64.ico"
 Name: "{commondesktop}\Secure Browsing"; Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\start_browsing.pyw"""; WorkingDir: "{userappdata}"; Comment: "OpenSecurity Secure Browsing"; IconFilename: "{app}\bin\ui\gfx\opensecurity_browsing_64.ico"
 Name: "{group}\Uninstall OpenSecurity"; Filename: "{uninstallexe}"
 
 [Run]
-; Run after installment
 Filename: "{app}\cygwin64\bin\dash.exe"; Parameters: "/bin/rebaseall"; Description: "Rebasing background system"; WorkingDir: "{app}"; StatusMsg: "Rebasing background system..."; Flags: runascurrentuser
 Filename: "{app}\install\fix_cygwin_paths.bat"; Description: "Fixing Cygwin paths"; WorkingDir: "{app}\install"; StatusMsg: "Fixing Cygwin Paths...";
 Filename: "{app}\cygwin64\bin\bash.exe"; Parameters: "-l -i -c echo -n"; Description: "Enforcing login environment for shells"; WorkingDir: "{app}"; StatusMsg: "Enforcing login environment for shells...";
@@ -64,10 +60,43 @@
 Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_tray.pyw"""; WorkingDir: "{userappdata}"; Description: "Launching OpenSecurity Tray Icon"; Flags: nowait
 
 [UninstallRun]
-; When uninstalling run this command prior
 Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\terminate_client_tray.pyw"" stop"; WorkingDir: "{app}"; StatusMsg: "Stopping the OpenSecurity Client Tray Service"; Flags: runascurrentuser
 Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" stop"; WorkingDir: "{app}"; StatusMsg: "Stopping the OpenSecurity Service"; Flags: runascurrentuser
 Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" remove"; WorkingDir: "{app}"; StatusMsg: "Removing the OpenSecurity Service"; Flags: runascurrentuser
 
 [UninstallDelete]
 Type: filesandordirs; Name: "{app}"
+
+
+[Code]
+var
+  UserInputPage: TInputQueryWizardPage;
+
+procedure InitializeWizard;
+begin
+
+  // Create the page
+  UserInputPage := CreateInputQueryPage(wpWelcome,
+    'Installation Details', 
+    'Essential settings for the current OpenSecurity Installation',
+    'Please specify concrete details for the OpenSecurity Installation. In doubt, leave unchanged.');
+
+  // Add items (False means it's not a password edit)
+  UserInputPage.Add('VM Browser:', False);
+  UserInputPage.Add('URL of Logserver:', False);
+
+  // Set initial values (optional)
+  UserInputPage.Values[0] := '/usr/bin/chromium';
+  UserInputPage.Values[1] := 'http://10.215.5.166/opensecurity/log';
+
+end;
+
+function VMBrowser(Param: String): String;
+begin
+  Result := UserInputPage.Values[0]
+end;
+
+function URLLogServer(Param: String): String;
+begin
+  Result := UserInputPage.Values[1]
+end;