diff --git a/config/ahenk.conf b/config/ahenk.conf index 449a65b..5f85a72 100644 --- a/config/ahenk.conf +++ b/config/ahenk.conf @@ -12,7 +12,7 @@ password = host = port = 5222 use_tls = false -receiverjid = +receiverjid = lider_sunucu receiverresource = servicename = receivefileparam = /tmp/ @@ -24,5 +24,5 @@ get_policy_timeout = 30 [MACHINE] type = default -agreement = 1 +agreement = 2 diff --git a/src/base/registration/registration.py b/src/base/registration/registration.py index 7da69b4..9bd9aaa 100644 --- a/src/base/registration/registration.py +++ b/src/base/registration/registration.py @@ -136,6 +136,7 @@ class Registration: 'hardware.usbDevices': str(System.Hardware.usb_devices()), 'hardware.printers': str(System.Hardware.printers()), 'hardware.systemDefinitions': str(System.Hardware.system_definitions()), + 'hardware.model.version': str(System.Hardware.machine_model()), 'hardware.memory.total': System.Hardware.Memory.total(), 'hardware.network.ipAddresses': str(System.Hardware.Network.ip_addresses()), 'sessions.userNames': str(System.Sessions.user_name()), diff --git a/src/base/system/system.py b/src/base/system/system.py index 7473586..5696515 100644 --- a/src/base/system/system.py +++ b/src/base/system/system.py @@ -574,6 +574,14 @@ class System: arr.append(line) return arr + @staticmethod + def machine_model(): + try: + result_code, p_out, p_err = Util.execute('sudo dmidecode --string system-version') + return str(p_out) + except: + raise + @staticmethod def machine_type(): config = configparser.ConfigParser() diff --git a/src/base/util/util.py b/src/base/util/util.py index 04cf066..87e908b 100644 --- a/src/base/util/util.py +++ b/src/base/util/util.py @@ -291,6 +291,11 @@ class Util: def generate_uuid(): return str(uuid.uuid4()) + @staticmethod + def get_language(): + locale_info = locale.getdefaultlocale() + return locale_info[0] + @staticmethod def set_permission(path, permission_code): Util.execute('chmod -R {0} {1}'.format(permission_code, path))