diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-09-12 18:58:04 -0400 |
| commit | 045fe0ee9d43aa825de6fbf14fe8fd48953d4eff (patch) | |
| tree | e0743c13e20845a613ba8e4064cb1e0f10f54025 /docs/source/siteadmin/deploying.rst | |
| parent | a02831687a6026b2baa0f971ecb3e594c3f415e2 (diff) | |
| parent | 66cafc3b74d476710013efb46341b989028f3057 (diff) | |
| download | mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.lz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.tar.xz mediagoblin-045fe0ee9d43aa825de6fbf14fe8fd48953d4eff.zip | |
Merge branch 'master' into OPW-Moderation-Update
Conflicts:
mediagoblin/db/migrations.py
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`. .. :: |