summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-08-29 22:00:27 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-08-29 22:00:27 (GMT)
commit648d5624db5a0f271e48565142dc4307505ba647 (patch)
treee5480074cb2945810379651b860c289b34f3fbdb
parent280e43e06413774d8d9d523d781aa6ad7804599f (diff)
downloadlinhes_pkgbuild-648d5624db5a0f271e48565142dc4307505ba647.zip
linhes_pkgbuild-648d5624db5a0f271e48565142dc4307505ba647.tar.gz
linhes_pkgbuild-648d5624db5a0f271e48565142dc4307505ba647.tar.bz2
mythvantage-config: add ghosd/func/certmaster
-rwxr-xr-xabs/mv-core/MythVantage-config/PKGBUILD2
-rwxr-xr-xabs/mv-core/MythVantage-config/mv_hostype.py15
2 files changed, 14 insertions, 3 deletions
diff --git a/abs/mv-core/MythVantage-config/PKGBUILD b/abs/mv-core/MythVantage-config/PKGBUILD
index 752c67b..0942671 100755
--- a/abs/mv-core/MythVantage-config/PKGBUILD
+++ b/abs/mv-core/MythVantage-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=MythVantage-config
pkgver=3.2
-pkgrel=166
+pkgrel=170
pkgdesc="The Gui-installer"
depends=(bc libstatgrab mysql-python expect curl dnsutils parted
diff --git a/abs/mv-core/MythVantage-config/mv_hostype.py b/abs/mv-core/MythVantage-config/mv_hostype.py
index 5d033fa..d6ec0ed 100755
--- a/abs/mv-core/MythVantage-config/mv_hostype.py
+++ b/abs/mv-core/MythVantage-config/mv_hostype.py
@@ -113,7 +113,9 @@ def setup_func_key():
def setup_func_minion(dbhost):
logging.info(" Setting up the func minion:")
logging.debug(" certmaster is %s:",dbhost)
- cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/func/minion.conf ''' %dbhost
+ #cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/func/minion.conf ''' %dbhost
+ #mv_common.runcmd(cmd)
+ cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/certmaster/minion.conf ''' %dbhost
mv_common.runcmd(cmd)
def setup_syslog(dbhost):
@@ -140,6 +142,8 @@ def hostypeprint(systemconfig):
setup_db()
install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"]
daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"]
+ if data_config.SYSTEMTYPE == "MythVantage":
+ install_list.append('ghosd')
elif systemconfig["SystemType"] == "Master_backend":
logging.info("Master backend system being configured")
@@ -151,8 +155,10 @@ def hostypeprint(systemconfig):
run_mysqlnetwork = True
if data_config.SYSTEMTYPE == "MythVantage":
install_list.append('func')
+ daemon_list.append('func')
install_list.append('certmaster')
daemon_list.append('certmaster')
+ install_list.append('ghosd')
elif systemconfig["SystemType"] == "Slave_backend":
logging.info("Slave backend system being configured")
@@ -169,6 +175,7 @@ def hostypeprint(systemconfig):
install_list.append('func')
daemon_list.append('funcd')
remove_list.append("lighttpd")
+ install_list.append('ghosd')
elif systemconfig["SystemType"] == "Frontend_only":
@@ -185,7 +192,7 @@ def hostypeprint(systemconfig):
install_list.append('func')
daemon_list.append('funcd')
remove_list.append("lighttpd")
-
+ install_list.append('ghosd')
for pkg in install_list:
@@ -200,10 +207,14 @@ def hostypeprint(systemconfig):
logging.debug(" Will run the frontend")
mv_common.add_service("frontend")
mv_common.add_service("hal")
+ if data_config.SYSTEMTYPE == "MythVantage":
+ mv_common.add_service("ghosd")
else:
logging.debug(" Will NOT run the frontend")
mv_common.remove_service("frontend")
mv_common.remove_service("hal")
+ if data_config.SYSTEMTYPE == "MythVantage":
+ mv_common.remove_service("ghosd")
if run_mysqlnetwork: