Skip to content

Commit

Permalink
Address comments and fix documentation for update_deps
Browse files Browse the repository at this point in the history
  • Loading branch information
mgersh committed Oct 28, 2015
1 parent 044c85d commit 3d79bd9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions docs/dev/vagrant.rst
Expand Up @@ -51,11 +51,11 @@ Note that you will not be able to see the VM, since it runs in a "headless" mode

The following command connects to the running VM and installs the software dependencies: ::

vagrant ssh -- -t -t -C "/home/vagrant/devsite/esp/update_deps.sh --virtualenv=/home/vagrant/devsite_virtualenv"
fab update_deps

Finally, you should use Fabric to deploy the development environment.

Most developers will want to seed their environment with a database dump from an existing chapter, subject to a confidentiality agreement and security requirements on the part of the developer. The 'vagrant_dev_setup' task accepts optional arguments to load a database dump in .sql.gz or .sql.gz.gpg format: ::
The development environment can be seeded with a database dump from an existing chapter, subject to a confidentiality agreement and security requirements on the part of the developer. The 'vagrant_dev_setup' task accepts optional arguments to load a database dump in .sql.gz or .sql.gz.gpg format: ::

fab vagrant_dev_setup:dbuser=chaptername,dbfile=/path/to/chaptername.sql.gz.gpg

Expand Down
4 changes: 2 additions & 2 deletions fabfile.py
Expand Up @@ -140,7 +140,7 @@ def initialize_db():
run('python manage.py migrate')
run('python manage.py createsuperuser')

def update():
def post_db_load():
with esp_env():
# Trying to load a db dump with migrations ahead of your branch
# was probably a bad idea anyway
Expand Down Expand Up @@ -246,7 +246,7 @@ def load_db_dump(dbuser, dbfile):

ensure_encrypted_partition()
load_encrypted_database(dbuser, dbfile)
update()
post_db_load()

@task
def recreate_encrypted_partition():
Expand Down

0 comments on commit 3d79bd9

Please sign in to comment.