# HG changeset patch
# User Oliver Maurhart <oliver.maurhart@ait.ac.at>
# Date 1417186356 -3600
# Node ID 7310daa5a362c0570af89a99116ce7156178d2b4
# Parent  5547ed24adf36878a309471a4eb81c19aed7467d
fix for downloading ImageUrl

diff -r 5547ed24adf3 -r 7310daa5a362 OpenSecurity.iss
--- a/OpenSecurity.iss	Tue Nov 11 16:19:03 2014 +0100
+++ b/OpenSecurity.iss	Fri Nov 28 15:52:36 2014 +0100
@@ -35,7 +35,7 @@
 AppContact=AIT Austrian Institute of Technology
 AppPublisher=AIT Austrian Institute of Technology
 AppPublisherURL=http://www.ait.ac.at/
-AppVersion=0.2.12
+AppVersion=1.0
 ArchitecturesInstallIn64BitMode=x64
 DefaultDirName={pf}\OpenSecurity
 DefaultGroupName=OpenSecurity
@@ -47,7 +47,7 @@
 ; DisableWelcomePage=yes
 LicenseFile=OpenSecurity\Lizenz.txt
 OutputDir="."
-OutputBaseFilename="OpenSecurity Setup V0.2.12"
+OutputBaseFilename="OpenSecurity Setup V1.0"
 OutputManifestFile=OpenSecurity-Setup-Manifest.txt
 SetupIconFile=OpenSecurity\bin\ui\gfx\OpenSecurity.ico
 SolidCompression=yes
@@ -73,6 +73,7 @@
 Root: HKLM; 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: "{code:URLLogServer}"; Flags: uninsdeletevalue
 Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "Browser"; ValueType: string; ValueData: "{code:VMBrowser}"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "ImageUrl"; ValueType: string; ValueData: "http://service.x-net.at/opensecurity/OsecVM_latest_clamav.ova"; Flags: uninsdeletevalue
 Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\services\USBSTOR"; ValueName: "Start"; ValueType: dword; ValueData: 4;
 
 [Icons]
@@ -119,7 +120,7 @@
 
   // Set initial values (optional)
   UserInputPage.Values[0] := '/usr/bin/chromium';
-  UserInputPage.Values[1] := 'http://10.215.5.166/opensecurity/log';
+  UserInputPage.Values[1] := 'http://placeholder.mydomain.local:10000/logpath';
 
 end;
 
diff -r 5547ed24adf3 -r 7310daa5a362 OpenSecurity/bin/__init__.py
--- a/OpenSecurity/bin/__init__.py	Tue Nov 11 16:19:03 2014 +0100
+++ b/OpenSecurity/bin/__init__.py	Fri Nov 28 15:52:36 2014 +0100
@@ -44,5 +44,5 @@
 __copyright__   = 'Copyright 2014 The OpenSecurity Consortium'
 __license__     = 'GPL v3'
 __title__       = 'opensecurity'
-__version__     = '0.2.12'
+__version__     = '1.0'
 
diff -r 5547ed24adf3 -r 7310daa5a362 OpenSecurity/bin/download_initial_image.sh
--- a/OpenSecurity/bin/download_initial_image.sh	Tue Nov 11 16:19:03 2014 +0100
+++ b/OpenSecurity/bin/download_initial_image.sh	Fri Nov 28 15:52:36 2014 +0100
@@ -67,7 +67,12 @@
 fi
 
 # start download
-URL="http://service.x-net.at/opensecurity/OsecVM_latest.ova"
+URL=$(cat /proc/registry64/HKEY_LOCAL_MACHINE/SOFTWARE/OpenSecurity/ImageUrl)
+if [ $? != "0" ]; then
+    echo "no URL given at HKEY_LOCAL_MACHINE/SOFTWARE/OpenSecurity/ImageUrl"
+    echo "don't know where to look"
+    exit 1
+fi
 wget --progress=dot:mega ${URL} -O "${TARGET_FOLDER}"/OsecVM.ova