From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 4 Feb 2016 14:42:35 +0000 (+0100)
Subject: Merge branch 'feature/haystack' into dev
X-Git-Tag: 1.6b~5^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c861d870f0451a1f6cc991067b7d00a8e447f8b1;p=telemeta.git

Merge branch 'feature/haystack' into dev

Conflicts:
	app/deploy/start_app.sh
---

c861d870f0451a1f6cc991067b7d00a8e447f8b1
diff --cc README.rst
index c7f6a7f7,f3955ee4..c5231c94
--- a/README.rst
+++ b/README.rst
@@@ -120,23 -120,9 +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
  ====================