diff --git a/WAPT/control b/WAPT/control index fea70ea..d5dceee 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,30 +1,30 @@ package : fws-fusioninventory -version : 2.4.2 +version : 2.4.2-3 architecture : all section : base priority : optional maintainer : Kevin Guerineau description : FusionInventory is a software for inventory computers. -depends : -conflicts : -maturity : +depends : +conflicts : +maturity : locale : all target_os : windows min_os_version : 5.0 -max_os_version : +max_os_version : min_wapt_version : 1.3.12 -sources : -installed_size : -impacted_process : +sources : +installed_size : +impacted_process : description_fr : FusionInventory est un logiciel d'inventaire d'ordinateurs -description_pl : -description_de : -description_es : -audit_schedule : -editor : -keywords : -licence : -homepage : +description_pl : +description_de : +description_es : +audit_schedule : +editor : +keywords : +licence : +homepage : package_uuid : 8151a535-59a4-4951-bb82-c3f7c98644f5 signer : Daniel Berteaud signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a diff --git a/fusioninventory-agent_windows-x64_2.4.2.exe b/fusioninventory-agent_windows-x64_2.4.2.exe index 50f9616..089b177 100644 Binary files a/fusioninventory-agent_windows-x64_2.4.2.exe and b/fusioninventory-agent_windows-x64_2.4.2.exe differ diff --git a/fusioninventory-agent_windows-x86_2.4.2.exe b/fusioninventory-agent_windows-x86_2.4.2.exe index c0c6885..b2e21cc 100644 Binary files a/fusioninventory-agent_windows-x86_2.4.2.exe and b/fusioninventory-agent_windows-x86_2.4.2.exe differ diff --git a/setup.py b/setup.py index 6da9583..9791a44 100644 --- a/setup.py +++ b/setup.py @@ -1,28 +1,27 @@ # -*- coding: utf-8 -*- from setuphelpers import * +from cryptography.fernet import Fernet import json uninstallkey = [] -key='FusionInventory-Agent' - def install(): - print('Opening variable file') - variables = json.loads(open(makepath(programfiles32,'wapt','variables.json'),'r').read()) + print('Reading variables') + key = open(makepath(programfiles32,'wapt','private','symetric.txt'),'r').read() + f = Fernet(key) + variables = json.loads(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())) if not 'fusinv_server' in variables: error('Missing fusinv_server variable') parameters = '/S /acceptlicense /server="%s" /execmode=service /runnow' % (variables['fusinv_server']) if 'fusinv_user' in variables and 'fusinv_pass' in variables: parameters = parameters + ' /user="%s" /password="%s"' % (variables['fusinv_user'],variables['fusinv_pass']) - print('installing Fusion inventory agent') versionpaquet = control['version'].split('-',1)[0] if iswin64(): - install_exe_if_needed("fusioninventory-agent_windows-x64_%s.exe" % versionpaquet,parameters,key=key,min_version=versionpaquet) + install_exe_if_needed("fusioninventory-agent_windows-x64_%s.exe" % versionpaquet,parameters,key='FusionInventory-Agent',min_version=versionpaquet) else: - install_exe_if_needed("fusioninventory-agent_windows-x86_%s.exe" % versionpaquet,parameters,key=key,min_version=versionpaquet) - + install_exe_if_needed("fusioninventory-agent_windows-x86_%s.exe" % versionpaquet,parameters,key='FusionInventory-Agent',min_version=versionpaquet) def update_package(): @@ -75,7 +74,6 @@ def update_package(): print('Download ' + url86) wget(url86,filenamex86) - if __name__ == '__main__': update_package()