diff options
Diffstat (limited to 'abs/core/LinHES-config/mv_advanced.py')
| -rwxr-xr-x | abs/core/LinHES-config/mv_advanced.py | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/abs/core/LinHES-config/mv_advanced.py b/abs/core/LinHES-config/mv_advanced.py index 3c93e0c..aa0dcd8 100755 --- a/abs/core/LinHES-config/mv_advanced.py +++ b/abs/core/LinHES-config/mv_advanced.py @@ -207,7 +207,7 @@ def setup_mythweb(UseMythWEB): def setup_samba(systemconfig,data_config): mythhome = data_config.MYTHHOME - if systemconfig["UseSamba"] == "1": + if systemconfig.get("UseSamba") == "1": logging.info(" Activating windows file sharing") usersamba=mythhome+"/templates/smb.conf" mv_common.pacinstall("samba") @@ -223,22 +223,22 @@ def setup_samba(systemconfig,data_config): cmd = "install -D -m755 %s /etc/samba/smb.conf" %usersamba mv_common.runcmd(cmd) else: - Samba_media = systemconfig["Samba_media"] - Samba_home = systemconfig["Samba_home"] - if systemconfig["Samba_mediareadonly"] == "0": + Samba_media = systemconfig.get("Samba_media") + Samba_home = systemconfig.get("Samba_home") + if systemconfig.get("Samba_mediareadonly") == "0": smreadonly = "yes" else: smreadonly = "no" - if systemconfig["Samba_homereadonly"] == "0": + if systemconfig.get("Samba_homereadonly") == "0": shreadonly = "yes" else: shreadonly = "no" - domain = systemconfig["Samba_domain"] - servername = systemconfig["hostname"] + domain = systemconfig.get("Samba_domain") + servername = systemconfig.get("hostname") try: - f = open(systemconfig["TEMPLATES"]+"/samba/smb.conf.template",'r') + f = open(systemconfig.get("TEMPLATES")+"/samba/smb.conf.template",'r') t_smbconf = f.readlines() f.close() except: @@ -355,37 +355,37 @@ def setup_advanced(systemconfig,data_config): return logging.info("____Start of advanced configuration____") create_link = False - if systemconfig["SystemType"] == "Master_backend": + if systemconfig.get("SystemType") == "Master_backend": create_link = True setup_pacman(create_link) - setup_ncid_client(systemconfig["dbhost"], - systemconfig["TEMPLATES"]+"/ncid.conf.template") + setup_ncid_client(systemconfig.get("dbhost"), + systemconfig.get("TEMPLATES")+"/ncid.conf.template") - setup_ncid_daemon(systemconfig["nciddSerialPort"], - systemconfig["TEMPLATES"]+"/ncidd.conf.template", - systemconfig["Runncidd"]) + setup_ncid_daemon(systemconfig.get("nciddSerialPort"), + systemconfig.get("TEMPLATES")+"/ncidd.conf.template", + systemconfig.get("Runncidd")) - setup_splash(systemconfig["Usebootsplash"]) + setup_splash(systemconfig.get("Usebootsplash")) if data_config.SYSTEMTYPE == "MythVantage": - setup_hobbit(systemconfig["UseHobbit"], - systemconfig["SystemType"], - systemconfig["dbhost"]) + setup_hobbit(systemconfig.get("UseHobbit"), + systemconfig.get("SystemType"), + systemconfig.get("dbhost")) if data_config.SYSTEMTYPE == "LinHES": - setup_rrd(systemconfig["UseRRD"]) + setup_rrd(systemconfig.get("UseRRD")) - setup_evrouter(systemconfig["UseEvrouter"], - systemconfig["EvrouterConfig"], - systemconfig["TEMPLATES"]) + setup_evrouter(systemconfig.get("UseEvrouter"), + systemconfig.get("EvrouterConfig"), + systemconfig.get("TEMPLATES")) - setup_DNSmasq(systemconfig["RunDHCP"], - systemconfig["mythip"], - systemconfig["mythgw"], - systemconfig["mythdns"]) + setup_DNSmasq(systemconfig.get("RunDHCP"), + systemconfig.get("mythip"), + systemconfig.get("mythgw"), + systemconfig.get("mythdns")) - setup_mythweb(systemconfig["UseMythWEB"]) + setup_mythweb(systemconfig.get("UseMythWEB")) setup_samba(systemconfig,data_config) - setup_NFSshares(systemconfig["UseNFS"], - systemconfig["TEMPLATES"]+"/exports.template") + setup_NFSshares(systemconfig.get("UseNFS"), + systemconfig.get("TEMPLATES")+"/exports.template") - setup_dyndns(systemconfig["DDnsEnable"]) + setup_dyndns(systemconfig.get("DDnsEnable")) logging.info("__End of advanced configuration\n") |