diff -r 8de10138ce9e -r 740d11ae9e28 sbin/sync/fabfile.py --- a/sbin/sync/fabfile.py Thu Nov 29 18:24:48 2012 +0100 +++ b/sbin/sync/fabfile.py Thu Nov 29 18:59:30 2012 +0100 @@ -145,33 +145,15 @@ template_path = os.path.join(export_path, "web", env.platform_web_module, "config.py.tmpl") context = { - 'base_dir': os.path.join(remotepath, env.platform_web_module).rstrip("/")+"/", - 'base_url': env.base_url, - 'web_url': env.web_url, - 'stream_url': env.stream_url, - 'stream_src_prefix': env.stream_src_prefix, - 'ffmpeg_path': env.ffmpeg_path, - 'db_engine': env.db_engine, - 'db_name': env.db_name, - 'db_user': env.db_user, - 'db_password': env.db_password, - 'db_host': env.db_host, - 'db_port': env.db_port, - 'log_file': env.log_file, - 'google_analytics_code': env.google_analytics_code, - 'email_use_tls': env.email_use_tls, - 'email_host': env.email_host, - 'email_host_user': env.email_host_user, - 'email_host_user': env.email_host_user, - 'email_port': env.email_port, - 'forbidden_stream_url': env.forbidden_stream_url, + 'base_dir': os.path.join(remotepath, env.platform_web_module).rstrip("/")+"/", } + context.update(env.config['web']) if not exists(remote_config_path, verbose=True): upload_template(template_path, remote_config_path, context=context) def export_version(**kwargs): - print("export version %s for %s" % (repr(kwargs))) + print("export version %s" % (repr(kwargs))) export_path = get_export_path("_".join(["%s_%s" % (k,v) for k,v in kwargs.items()])) @@ -286,12 +268,12 @@ @task def sync_platform(version_web, version_ldt): - print(green("sync platform with version %s" % version)) + print(green("sync platform with version web %s, ldt %s" % (version_web, version_ldt))) export_path = export_version(ldt=version_ldt, web=version_web) export_path_ldt = os.path.join(export_path,'ldt') export_path_web = os.path.join(export_path,'web') - do_sync_ldt(version, export_path_ldt) - do_sync_web(version, export_path_web) + do_sync_ldt(version_ldt, export_path_ldt) + do_sync_web(version_web, export_path_web) create_config(export_path_web) clean_export_folder(export_path) relaunch_server()