From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sun, 31 Jan 2016 08:32:42 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6b~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2e0883aa735e42e5ff6874988f810ec4b2168289;p=telemeta.git

Merge branch 'dev'
---

2e0883aa735e42e5ff6874988f810ec4b2168289
diff --cc README.rst
index f3955ee4,c7f6a7f7..c5231c94
--- a/README.rst
+++ b/README.rst
@@@ -120,9 -120,23 +120,23 @@@ First install `Git <http://git-scm.com/
      cd Telemeta
      docker-compose up
  
 -You can now browse http://localhost:8000 to get the web interface.
 +You can now browse http://localhost:8000
  
  
+ Restore / backup
+ ================
+ 
+ To restore a backuped database, put your backup file in data/backup, then in another terminal::
+ 
+     docker-compose run db /srv/backup/restore_db.sh FILENAME
+ 
+ where FILENAME is the backup filename (can be .sql or .sql.gz)
+ 
+ To backup the database, just run in another terminal::
+ 
+     docker-compose run db /srv/backup/backup_db.sh
+ 
+ 
  API / Documentation
  ====================