wapt
/
wapt-glpi-agent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various fixes

This commit is contained in:
Daniel Berteaud 2023-03-27 14:44:48 +02:00
parent 003062a217
commit 0c9049f3a9
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,3 +1,3 @@
# wapt-fusioninventory
# wapt-glpi-agent
FusionInventory Agent WAPT package
GLPI Agent WAPT package

8
WAPT/control
View File

@ -1,5 +1,5 @@
package : eht-glpi-agent
version : 1.4-3
version : 1.4-6
architecture : all
section : base
priority : optional
@ -29,7 +29,7 @@ editor :
keywords : inventory
licence : GPLv2+
homepage : http://glpi-project.org/
package_uuid : 6248be43-0eca-41e8-8669-715b2a11a891
package_uuid : 2a4a9893-325a-4301-8ebe-db2418f89133
valid_from :
valid_until :
forced_install_on :
@ -39,6 +39,6 @@ max_os_version :
icon_sha256sum : fba3af4f79be43de12a5f9438a98831edc7a08c5761e5f216eb9d9ca5d98b3ff
signer : dbd
signer_fingerprint: e9156ec73f1ea6b50f33e0d9f580e8ae56db147100894bb5d2d4648a46f07ed1
signature : tFm2L6g17bG0buZW6ZeKFk0tJrBbx5R+rPNoxyEip1QTtbaV3ulI3OLyoOZdeK16f+9W4w2hDYNghV4Hd5KnEXL7DpW/JELwaomyoJr2Jq8j4mIKVmEok48rApssOm/iwtPs+kseRtv3Yi6sEHlYg7yqzndIgIWxtQq48GkYwephCsdZEV/RH0uixE1XDf36d6Z4PlxHILZ68o1JOxbCE/rKa6S1kunxnLNsV3eg3YF1ALVj65Wovr3raJsLFOoqRp87a6uxnHViNtIjscR5DlhXGCQqqEpMWcGY6KNBsU86aOG3GqnlcNjvKKvwOgyYNLxZvO4fiNVNXmqR5tLVKg==
signature_date : 2023-03-27T12:54:25.342941
signature : Pflv3b4Y6tEimQYzmqXY1pssMBXTBx5L0GFTm8t/YfK2T8FMK97n+aS/KLmRfQQFHQk8a1dWPbJ9FtMw2xTDIh+Ao+7ne4PD6V82wTlKTCd48DrGnCRHiD1mhEU95d4fDW9v0vHJwNezJWZ3CEee/iG2kRkYizEanjZsHaGs29vIzPDbPdQ27wC4jYe2EKH9C9+0slDMyvrPoq1xUtmkusRgsEGupgQEI1ymUT8C4PSGc96jy8agIkQYXsWHSff0bJ/JcoFUHPffdhozOeAeetzVLRZMlqATG+EZ67CzJtE/Vi+nKiAXFy/dOoCL77sj3LKjo5PQ4oBIp589oL3+sA==
signature_date : 2023-03-27T14:42:55.641309
signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,description_pt,description_it,description_nl,description_ru,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,changelog,min_os_version,max_os_version,icon_sha256sum,signer,signer_fingerprint,signature_date,signed_attributes

25
setup.py
View File

@ -23,11 +23,16 @@ def install():
'RUNNOW': '1'
}
if 'glpi_inv_servers' in variables:
print('Found servers %s in settings' % (','.join(variables['glpi_inv_servers']))
props['SERVER'] = ','.join(variables['glpi_inv_servers'])
if isinstance(variables['glpi_inv_servers'], str):
print('Found servers %s in settings' % variables['glpi_inv_servers'])
props['SERVER'] = variables['glpi_inv_servers']
elif isinstance(variables['glpi_inv_servers'], list):
print('Found servers %s in settings' % (','.join(variables['glpi_inv_servers'])))
props['SERVER'] = ','.join(variables['glpi_inv_servers'])
if 'glpi_inv_user' in variables and 'glpi_inv_pass' in variables:
print('Found user % in settings' % variables['glpi_inv_user'])
print('Found user %s in settings' % variables['glpi_inv_user'])
props['USER'] = variables['glpi_inv_user']
props['PASSWORD'] = variables['glpi_inv_pass']
@ -73,9 +78,17 @@ def audit():
print(r"key HKEY_LOCAL_MACHINE\SOFTWARE\GLPI-Agent\server doesn't exist")
return "ERROR"
val_server = registry_readstring(HKEY_LOCAL_MACHINE,makepath('SOFTWARE','GLPI-Agent'),'server')
if val_server != ','.join(variables['fusinv_servers']) :
print("server config is not %, it's % instead" % (','.join(variables['fusinv_servers']), val_server) )
return "WARNING"
if 'fusinv_servers' in variables:
if isinstance(variables['fusinv_servers'], str):
if val_server != variables['fusinv_servers']:
print("server config is not %, it's % instead" % (variables['fusinv_servers'], val_server) )
return "WARNING"
elif isinstance(variables['fusinv_servers'], list):
if val_server != ','.join(variables['fusinv_servers']) :
print("server config is not %, it's % instead" % (','.join(variables['fusinv_servers']), val_server) )
return "WARNING"
if 'fusinv_user' in variables and 'fusinv_pass' in variables:
if not registry_readstring(HKEY_LOCAL_MACHINE,makepath('SOFTWARE','GLPI-Agent'),'user'):
print(r"key HKEY_LOCAL_MACHINE\SOFTWARE\GLPI-Agent\user doesn't exist")