Merge branch 'master' of github.com:proycon/clam

proycon · Mar 15, 2018 · af1f4aa · af1f4aa
2 parents 37d62ca + 958bd71
commit af1f4aa
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/clam/common/data.py b/clam/common/data.py
@@ -24,6 +24,7 @@
 import io
 import json
 import time
+import re
 import yaml
 from copy import copy
 from lxml import etree as ElementTree
@@ -2480,6 +2481,12 @@ def loadconfig(callername, required=True):
         with io.open(configfile,'r', encoding='utf-8') as f:
             data = yaml.safe_load(f.read())
         for key, value in data.items():
+            #replace variables
+            if '{' in value:
+                variables = re.findall("\{\{\w+\}\}")
+                for v in variables:
+                    if v.strip('{}') in os.environ:
+                        value = value.replace(v,os.environ[v.strip('{}')])
             setattr(settingsmodule,key.upper(), value)
         return True