diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-22 14:20:53 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-22 14:20:53 +0000 |
| commit | 58691680b8dd93fab56fed914b0204f2b6751b6a (patch) | |
| tree | 8bc2301fb6ddab7f262a1dbfce48982525801341 | |
| parent | Move experiments, graph and cmdclient into contrib (diff) | |
| download | synapse-58691680b8dd93fab56fed914b0204f2b6751b6a.tar.xz | |
update .gitignore, set media-store-path in demo
| -rw-r--r-- | .gitignore | 11 | ||||
| -rwxr-xr-x | demo/start.sh | 3 |
2 files changed, 5 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index af90668c89..2ed22b1cd3 100644 --- a/.gitignore +++ b/.gitignore @@ -26,17 +26,12 @@ htmlcov demo/*.db demo/*.log +demo/*.log.* demo/*.pid +demo/media_store.* demo/etc -graph/*.svg -graph/*.png -graph/*.dot - -**/webclient/config.js -**/webclient/test/coverage/ -**/webclient/test/environment-protractor.js - uploads .idea/ +media_store/ diff --git a/demo/start.sh b/demo/start.sh index ce3e292486..bb2248770d 100755 --- a/demo/start.sh +++ b/demo/start.sh @@ -32,7 +32,8 @@ for port in 8080 8081 8082; do -D --pid-file "$DIR/$port.pid" \ --manhole $((port + 1000)) \ --tls-dh-params-path "demo/demo.tls.dh" \ - $PARAMS $SYNAPSE_PARAMS + --media-store-path "demo/media_store.$port" \ + $PARAMS $SYNAPSE_PARAMS \ python -m synapse.app.homeserver \ --config-path "demo/etc/$port.config" \ |