diff options
Diffstat (limited to 'abs/core/LinHES-config/mv_advanced.py')
| -rwxr-xr-x | abs/core/LinHES-config/mv_advanced.py | 66 |
1 files changed, 47 insertions, 19 deletions
diff --git a/abs/core/LinHES-config/mv_advanced.py b/abs/core/LinHES-config/mv_advanced.py index dd00f1d..7608604 100755 --- a/abs/core/LinHES-config/mv_advanced.py +++ b/abs/core/LinHES-config/mv_advanced.py @@ -34,28 +34,53 @@ def setup_pacman(create_link): else: logging.info(" Pacman link will not be created") return - -def setup_ncid_client(dbhost,templatefile): - #This always runs - logging.debug(" Configuring ncid client with server %s",dbhost) - cmd = '''sed -e "s/^set Host.*$/set Host %s /" %s >/etc/ncid/ncid.conf''' %(dbhost, templatefile) +def setup_ncid_client(runclient): + logging.debug(" Configuring ncid client") + if runclient == "1" : + mv_common.pacinstall("ncid") + mv_common.add_service("ncid-client") + else: + logging.debug(" Removing ncid client") + mv_common.remove_service("ncid-client") return -def setup_ncid_daemon(port,templatefile,Runncidd): +def setup_ncid_daemon(Runncidd): logging.info(" Configuring callerid daemon") if Runncidd == "1": - logging.debug(" Port: %s",port) - mv_common.cp_and_log("/etc/ncid/ncidd.conf",templatefile) - cmd = '''sed -e "s/.*set ttyport.*$/set ttyport = \/dev\/%s /" %s >/etc/ncid/ncidd.conf''' %(port,templatefile) - mv_common.runcmd(cmd) - mv_common.pacinstall("ncidd") - mv_common.add_service("ncidd") + mv_common.pacinstall("ncid") + mv_common.add_service("ncid-server") + mv_common.add_service("ncid-logger") else: logging.debug(" Callerid will not run") - mv_common.pacremove("ncidd") - mv_common.remove_service("ncidd") + mv_common.pacremove("ncid") + mv_common.remove_service("ncid-server") + mv_common.remove_service("ncid-logger") + return + + +#def setup_ncid_client(dbhost,templatefile): + ##This always runs + #logging.debug(" Configuring ncid client with server %s",dbhost) + #cmd = '''sed -e "s/^set Host.*$/set Host %s /" %s >/etc/ncid/ncid.conf''' %(dbhost, templatefile) + #return + +#def setup_ncid_daemon(port,templatefile,Runncidd): + #logging.info(" Configuring callerid daemon") + #if Runncidd == "1": + #logging.debug(" Port: %s",port) + #mv_common.cp_and_log("/etc/ncid/ncidd.conf",templatefile) + #cmd = '''sed -e "s/.*set ttyport.*$/set ttyport = \/dev\/%s /" %s >/etc/ncid/ncidd.conf''' %(port,templatefile) + #mv_common.runcmd(cmd) + #mv_common.pacinstall("ncidd") + #mv_common.add_service("ncidd") + #else: + #logging.debug(" Callerid will not run") + #mv_common.pacremove("ncidd") + #mv_common.remove_service("ncidd") + #return + def setup_splash(Usebootsplash): if Usebootsplash == "1": logging.info(" Enabling splash") @@ -359,12 +384,15 @@ def setup_advanced(systemconfig,data_config): if systemconfig.get("SystemType") == "Master_backend": create_link = True setup_pacman(create_link) - setup_ncid_client(systemconfig.get("dbhost"), - systemconfig.get("TEMPLATES")+"/ncid.conf.template") - setup_ncid_daemon(systemconfig.get("nciddSerialPort"), - systemconfig.get("TEMPLATES")+"/ncidd.conf.template", - systemconfig.get("Runncidd")) + setup_ncid_client(systemconfig.get("ncidclient")) + setup_ncid_daemon(systemconfig.get("Runncidd")) + #setup_ncid_client(systemconfig.get("dbhost"), + #systemconfig.get("TEMPLATES")+"/ncid.conf.template") + + #setup_ncid_daemon(systemconfig.get("nciddSerialPort"), + #systemconfig.get("TEMPLATES")+"/ncidd.conf.template", + #systemconfig.get("Runncidd")) setup_splash(systemconfig.get("Usebootsplash")) if data_config.SYSTEMTYPE == "MythVantage": |