1.1 --- a/OpenSecurity.iss Tue Nov 11 16:19:03 2014 +0100
1.2 +++ b/OpenSecurity.iss Fri Nov 28 15:52:36 2014 +0100
1.3 @@ -35,7 +35,7 @@
1.4 AppContact=AIT Austrian Institute of Technology
1.5 AppPublisher=AIT Austrian Institute of Technology
1.6 AppPublisherURL=http://www.ait.ac.at/
1.7 -AppVersion=0.2.12
1.8 +AppVersion=1.0
1.9 ArchitecturesInstallIn64BitMode=x64
1.10 DefaultDirName={pf}\OpenSecurity
1.11 DefaultGroupName=OpenSecurity
1.12 @@ -47,7 +47,7 @@
1.13 ; DisableWelcomePage=yes
1.14 LicenseFile=OpenSecurity\Lizenz.txt
1.15 OutputDir="."
1.16 -OutputBaseFilename="OpenSecurity Setup V0.2.12"
1.17 +OutputBaseFilename="OpenSecurity Setup V1.0"
1.18 OutputManifestFile=OpenSecurity-Setup-Manifest.txt
1.19 SetupIconFile=OpenSecurity\bin\ui\gfx\OpenSecurity.ico
1.20 SolidCompression=yes
1.21 @@ -73,6 +73,7 @@
1.22 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
1.23 Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "LogServerUrl"; ValueType: string; ValueData: "{code:URLLogServer}"; Flags: uninsdeletevalue
1.24 Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "Browser"; ValueType: string; ValueData: "{code:VMBrowser}"; Flags: uninsdeletevalue
1.25 +Root: HKLM; Subkey: "SOFTWARE\OpenSecurity"; ValueName: "ImageUrl"; ValueType: string; ValueData: "http://service.x-net.at/opensecurity/OsecVM_latest_clamav.ova"; Flags: uninsdeletevalue
1.26 Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\services\USBSTOR"; ValueName: "Start"; ValueType: dword; ValueData: 4;
1.27
1.28 [Icons]
1.29 @@ -119,7 +120,7 @@
1.30
1.31 // Set initial values (optional)
1.32 UserInputPage.Values[0] := '/usr/bin/chromium';
1.33 - UserInputPage.Values[1] := 'http://10.215.5.166/opensecurity/log';
1.34 + UserInputPage.Values[1] := 'http://placeholder.mydomain.local:10000/logpath';
1.35
1.36 end;
1.37
2.1 --- a/OpenSecurity/bin/__init__.py Tue Nov 11 16:19:03 2014 +0100
2.2 +++ b/OpenSecurity/bin/__init__.py Fri Nov 28 15:52:36 2014 +0100
2.3 @@ -44,5 +44,5 @@
2.4 __copyright__ = 'Copyright 2014 The OpenSecurity Consortium'
2.5 __license__ = 'GPL v3'
2.6 __title__ = 'opensecurity'
2.7 -__version__ = '0.2.12'
2.8 +__version__ = '1.0'
2.9
3.1 --- a/OpenSecurity/bin/download_initial_image.sh Tue Nov 11 16:19:03 2014 +0100
3.2 +++ b/OpenSecurity/bin/download_initial_image.sh Fri Nov 28 15:52:36 2014 +0100
3.3 @@ -67,7 +67,12 @@
3.4 fi
3.5
3.6 # start download
3.7 -URL="http://service.x-net.at/opensecurity/OsecVM_latest.ova"
3.8 +URL=$(cat /proc/registry64/HKEY_LOCAL_MACHINE/SOFTWARE/OpenSecurity/ImageUrl)
3.9 +if [ $? != "0" ]; then
3.10 + echo "no URL given at HKEY_LOCAL_MACHINE/SOFTWARE/OpenSecurity/ImageUrl"
3.11 + echo "don't know where to look"
3.12 + exit 1
3.13 +fi
3.14 wget --progress=dot:mega ${URL} -O "${TARGET_FOLDER}"/OsecVM.ova
3.15
3.16