From 485c9077215d8548bd173845ae521b37152ff1f3 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 22 Sep 2015 21:27:36 -0700 Subject: [PATCH] Return to recommending running run-dev.py manually. (imported from commit f050f2a8f2242dc23267c341d53517847d7fc560) --- README.dev | 27 +++++++++++++++++++++++---- provision.py | 4 ---- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/README.dev b/README.dev index 0bf0d05514..c7f24c51f4 100644 --- a/README.dev +++ b/README.dev @@ -6,12 +6,31 @@ Using Vagrant This is the recommended approach, and is tested on OS X 10.10 as well as Ubuntu 14.04. -If your host is OS X, download VirtualBox from and install it. - -If your host is Ubuntu 14.04: +* If your host is OS X, download VirtualBox from + + and install it. +* If your host is Ubuntu 14.04: sudo apt-get install vagrant lxc lxc-templates cgroup-lite redir -Once that's done, simply change to your zulip directory and run `vagrant up` in your terminal. You can now visit in your browser. To get shell access to the virtual machine running the server, use `vagrant ssh`. +Once that's done, simply change to your zulip directory and run +`vagrant up` in your terminal. That will install the development +server inside a Vagrant guest. + +Once that finishes, you can run the development server as follows: + vagrant ssh -- -L9991:localhost:9991 + # Now inside the container + cd /srv/zulip + source /srv/zulip-venv/bin/activate + ./tools/run-dev.py + +You can now visit in your browser. To get +shell access to the virtual machine running the server, use `vagrant ssh`. + +The run-dev.py console output will show any errors your Zulip +development server encounters. It runs on top of Django's "manage.py +runserver" tool, which will automatically restart the Zulip server +whenever you save changes to Python code. + By hand ------- diff --git a/provision.py b/provision.py index 67c536a2e7..3cee60837a 100644 --- a/provision.py +++ b/provision.py @@ -164,9 +164,5 @@ def main(): sh.do_destroy_rebuild_test_database(**LOUD) sh.setup_git_repo(**LOUD) - with sh.sudo: - sh.cp(os.path.join(ZULIP_PATH, "tools", "provision", "zulip-dev.conf"), "/etc/supervisor/conf.d/zulip-dev.conf", **LOUD) - sh.service("supervisor", "restart", **LOUD) - if __name__ == "__main__": sys.exit(main())