diff -r 85012ba55b83 -r a49769a3088d sbin/sync/fabfile.py --- a/sbin/sync/fabfile.py Thu Aug 30 15:29:09 2012 +0200 +++ b/sbin/sync/fabfile.py Fri Aug 31 15:50:15 2012 +0200 @@ -12,7 +12,7 @@ import config def get_export_path(version): - base_path = os.path.join(env.base_export_path,env.export_prefix).lstrip("/") + base_path = os.path.join(env.base_export_path,env.export_prefix).rstrip("/") return os.path.expanduser(base_path) + "_%s" % (str(version)) def clean_export_folder(path): @@ -31,7 +31,7 @@ activate_path = os.path.join(remotevirtualenvpath, "bin/activate") res = "" with prefix("source \"%s\"" % activate_path), prefix("export PYTHONPATH=\"%s\"" % remotepath), cd(remotepath): - tempfilepath = run("mktemp --tmpdir ldtplatform.XXXXXX") + tempfilepath = run("mktemp -t ldtplatform.XXXXXX") with settings(warn_only=True): run("echo \"import os\" > %s" % (tempfilepath)) map(lambda str: run("echo \"%s\" >> %s" % (str, tempfilepath)), @@ -141,13 +141,13 @@ 'db_host': env.db_host, 'db_port': env.db_port, 'log_file': env.log_file, - 'index_path': env.index_path, '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, } if not exists(remote_config_path, verbose=True): @@ -217,9 +217,9 @@ @task def relaunch_server(do_collectstatic=True): print("Relaunch server") + check_folder_access() if do_collectstatic: collectstatic(env.remote_web_path, env.remote_virtualenv_path, env.platform_web_module) - check_folder_access() sudo(env.web_relaunch_cmd, shell=False) @task