aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-08-26 15:50:47 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-08-26 15:50:47 -0500
commit3b8251f3296504f12aed72892b134dca49332467 (patch)
treed0af446c31c92386d2eee5ab922b72d90f55fee9 /docs
parent567c09f02ce1a88ffee462116d6603501b50e5a1 (diff)
downloadmediagoblin-3b8251f3296504f12aed72892b134dca49332467.tar.lz
mediagoblin-3b8251f3296504f12aed72892b134dca49332467.tar.xz
mediagoblin-3b8251f3296504f12aed72892b134dca49332467.zip
Switch docs back over to using old virtualenv setup while we resolve issue #755
Diffstat (limited to 'docs')
-rw-r--r--docs/source/siteadmin/deploying.rst16
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`.
.. ::