Return to recommending running run-dev.py manually.

(imported from commit f050f2a8f2242dc23267c341d53517847d7fc560)
This commit is contained in:
Tim Abbott 2015-09-22 21:27:36 -07:00
parent 53f74ef06a
commit 485c907721
2 changed files with 23 additions and 8 deletions

View File

@ -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. 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 <http://download.virtualbox.org/virtualbox/4.3.30/VirtualBox-4.3.30-101610-OSX.dmg> and install it. * If your host is OS X, download VirtualBox from
<http://download.virtualbox.org/virtualbox/4.3.30/VirtualBox-4.3.30-101610-OSX.dmg>
If your host is Ubuntu 14.04: and install it.
* If your host is Ubuntu 14.04:
sudo apt-get install vagrant lxc lxc-templates cgroup-lite redir 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 <http://localhost:9991/> 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 <http://localhost:9991/> 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 By hand
------- -------

View File

@ -164,9 +164,5 @@ def main():
sh.do_destroy_rebuild_test_database(**LOUD) sh.do_destroy_rebuild_test_database(**LOUD)
sh.setup_git_repo(**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__": if __name__ == "__main__":
sys.exit(main()) sys.exit(main())