Initial work on monitless installation

python_apps/media-monitor2/media/saas/launcher.py

@@ -97,9 +97,9 @@ class MM2(InstanceThread, Loggable):
 
         manager.loop()
 
-def launch_instance(name, root, global_cfg, apc_cfg):
+def launch_instance(name, root, global_cfg):
     cfg = {
-        'api_client'    : apc_cfg,
+        'api_client'    : global_cfg,
         'media_monitor' : global_cfg,
     }
     ai = AirtimeInstance(name, root, cfg)

python_apps/media-monitor2/mm2.py

@@ -4,12 +4,12 @@ import os
 from media.saas.launcher import setup_global, launch_instance, setup_logger
 from media.monitor.config import MMConfig
 
-def main(global_config, api_client_config, log_config):
+def main(global_config, log_config):
     """ function to run hosted install """
     mm_config = MMConfig(global_config)
     log = setup_logger( log_config, mm_config['logpath'] )
     setup_global(log)
-    launch_instance('hosted_install', '/', global_config, api_client_config)
+    launch_instance('hosted_install', '/', global_config)
 
 __doc__ = """
 Usage:

python_apps/media-monitor2/tests/prepare_tests.py

@@ -8,7 +8,7 @@ real_path1 = u'/home/rudi/throwaway/watch/unknown/unknown/ACDC_-_Back_In_Black-s
 opath = u"/home/rudi/Airtime/python_apps/media-monitor2/tests/"
 ppath = u"/home/rudi/Airtime/python_apps/media-monitor2/media/"
 
-api_client_path = '/etc/airtime/api_client.cfg'
+api_client_path = '/etc/airtime/airtime.conf'
 # holdover from the time we had a special config for testing
 sample_config = api_client_path
 real_config = api_client_path