update .gitignore, set media-store-path in demo

This commit is contained in:
Mark Haines 2015-01-22 14:20:53 +00:00
parent d3d0713de5
commit 58691680b8
2 changed files with 5 additions and 9 deletions

11
.gitignore vendored
View file

@ -26,17 +26,12 @@ htmlcov
demo/*.db demo/*.db
demo/*.log demo/*.log
demo/*.log.*
demo/*.pid demo/*.pid
demo/media_store.*
demo/etc demo/etc
graph/*.svg
graph/*.png
graph/*.dot
**/webclient/config.js
**/webclient/test/coverage/
**/webclient/test/environment-protractor.js
uploads uploads
.idea/ .idea/
media_store/

View file

@ -32,7 +32,8 @@ for port in 8080 8081 8082; do
-D --pid-file "$DIR/$port.pid" \ -D --pid-file "$DIR/$port.pid" \
--manhole $((port + 1000)) \ --manhole $((port + 1000)) \
--tls-dh-params-path "demo/demo.tls.dh" \ --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 \ python -m synapse.app.homeserver \
--config-path "demo/etc/$port.config" \ --config-path "demo/etc/$port.config" \