From 3a491ade29620b1e0436825d3049affbf024f35e Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sat, 12 May 2012 17:11:16 -0500
Subject: LinHES-config: mv_advanced, setup ncid when called from the service
 menu

---
 abs/core/LinHES-config/PKGBUILD       |  4 +--
 abs/core/LinHES-config/mv_advanced.py | 66 +++++++++++++++++++++++++----------
 2 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 7d23be3..76773a2 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.3
-pkgrel=72
+pkgrel=74
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -127,7 +127,7 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27'
          '9151c74fcaf18ec4cf5e757cfdbc7017'
          '3d1e4a119f38cff0498bf8a67e94e4b3'
          '71fd2d0d448fc2fcd15415a1beed7109'
-         '5f3259afe031fda189edae41dd1458f0'
+         'b83072f08725f1216a4d31e02d60c5e5'
          'e1715bbbabd42e7419755b09f60734aa'
          'b845de3e05c1734cce4b9ac5e8f1baaf'
          '6801f87992b44118a12b6dfe6ea68127'
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":
-- 
cgit v0.12