From b237290d6ed04074fded8db7c0eb69f61e9c3731 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 20 Dec 2018 13:17:48 +0100
Subject: [PATCH] Use YAML formatted variable file

---
 WAPT/control | 2 +-
 setup.py     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WAPT/control b/WAPT/control
index 82953f6..a1a00a5 100644
--- a/WAPT/control
+++ b/WAPT/control
@@ -1,5 +1,5 @@
 package           : fws-zabbix-agent
-version           : 4.0.1-3
+version           : 4.0.1-4
 architecture      : all
 section           : base
 priority          : optional
diff --git a/setup.py b/setup.py
index 2805f3d..56d08d5 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 from setuphelpers import *
-import json
-from cryptography.fernet import Fernet
 
 uninstallkey = []
 variables = {
@@ -11,8 +9,10 @@ variables = {
 # Read local variables file if available
 if isfile(makepath(programfiles32,'wapt','private','symetric.txt')) and isfile(makepath(programfiles32,'wapt','private','variables.txt')):
     print('Reading local encrypted variables file')
+    from cryptography.fernet import Fernet
+    import yaml
     f = Fernet(open(makepath(programfiles32,'wapt','private','symetric.txt'),'r').read())
-    variables.update(json.loads(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
+    variables.update(yaml.safe_load(f.decrypt(open(makepath(programfiles32,'wapt','private','variables.txt'),'r').read())))
 
 props = {
     'RMTCMD':0,