diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-08-28 23:28:09 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-08-28 23:28:09 +0530 |
| commit | 922599990d07d4ab1eb34cd57d59a4ced6882884 (patch) | |
| tree | 743e8a7572129dd4b905b535bf2a306886125304 /docs/source/siteadmin/deploying.rst | |
| parent | 7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6 (diff) | |
| parent | 7904402750df610102bc487dab4b4a3e01e15b91 (diff) | |
| download | mediagoblin-922599990d07d4ab1eb34cd57d59a4ced6882884.tar.lz mediagoblin-922599990d07d4ab1eb34cd57d59a4ced6882884.tar.xz mediagoblin-922599990d07d4ab1eb34cd57d59a4ced6882884.zip | |
Pull changes and resolve merge conflict.
Diffstat (limited to 'docs/source/siteadmin/deploying.rst')
| -rw-r--r-- | docs/source/siteadmin/deploying.rst | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index 6123dc9e..de4ce1ac 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -203,18 +203,20 @@ Clone the MediaGoblin repository and set up the git submodules:: cd mediagoblin git submodule init && git submodule update -Set up the in-package virtualenv via make:: - ./bootstrap.sh && ./configure && make +And set up the in-package virtualenv:: + + (virtualenv --system-site-packages . || virtualenv .) && ./bin/python setup.py develop .. note:: - Prefer not to use make, or want to use the "old way" of installing - MediaGoblin (maybe you know how to use virtualenv and python - packaging)? You still can! All that the above make script is doing - is installing an in-package virtualenv and running + We presently have an experimental make-style deployment system. if + you'd like to try it, instead of the above command, you can run:: + + ./bootstrap.sh && ./configure && make - ./bin/python setup.py develop + This also includes a number of nice features, such as keeping your + viratualenv up to date by simply running `make update`. .. :: |