summaryrefslogtreecommitdiff
path: root/azurelinuxagent/common/conf.py
diff options
context:
space:
mode:
Diffstat (limited to 'azurelinuxagent/common/conf.py')
-rw-r--r--azurelinuxagent/common/conf.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/azurelinuxagent/common/conf.py b/azurelinuxagent/common/conf.py
index 75a0248..33f953a 100644
--- a/azurelinuxagent/common/conf.py
+++ b/azurelinuxagent/common/conf.py
@@ -40,11 +40,11 @@ class ConfigurationProvider(object):
raise AgentConfigError("Can't not parse empty configuration")
for line in content.split('\n'):
if not line.startswith("#") and "=" in line:
- parts = line.split('=')
+ parts = line.split('=', 1)
if len(parts) < 2:
continue
key = parts[0].strip()
- value = parts[1].strip("\" ")
+ value = parts[1].split('#')[0].strip("\" ").strip()
self.values[key] = value if value != "None" else None
def get(self, key, default_val):
@@ -131,12 +131,14 @@ __STRING_OPTIONS__ = {
}
__INTEGER_OPTIONS__ = {
+ "OS.SshClientAliveInterval" : 180,
"Provisioning.PasswordCryptSaltLength" : 10,
"HttpProxy.Port" : None,
"ResourceDisk.SwapSizeMB" : 0,
"Autoupdate.Frequency" : 3600
}
+
def get_configuration(conf=__conf__):
options = {}
for option in __SWITCH_OPTIONS__:
@@ -190,6 +192,9 @@ def get_fips_enabled(conf=__conf__):
def get_openssl_cmd(conf=__conf__):
return conf.get("OS.OpensslPath", "/usr/bin/openssl")
+def get_ssh_client_alive_interval(conf=__conf__):
+ return conf.get("OS.SshClientAliveInterval", 180)
+
def get_ssh_dir(conf=__conf__):
return conf.get("OS.SshDir", "/etc/ssh")