Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Determine webclient path by the python module it is contained in

This commit is contained in:
Mark Haines 2014-11-04 16:19:03 +00:00
parent 4e52f9699b
commit dca3ba2f77
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/start.sh
View File

@ -41,6 +41,6 @@ for port in 8080 8081 8082; do
done done
echo "Starting webclient on port 8000..." echo "Starting webclient on port 8000..."
python "demo/webserver.py" -p 8000 -P "$DIR/webserver.pid" "webclient" python "demo/webserver.py" -p 8000 -P "$DIR/webserver.pid" "syweb/webclient"
cd "$CWD" cd "$CWD"

5
synapse/app/homeserver.py
View File

@ -42,6 +42,7 @@ import os
import re import re
import sys import sys
import sqlite3 import sqlite3
import syweb
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -58,7 +59,9 @@ class SynapseHomeServer(HomeServer):
return JsonResource() return JsonResource()
def build_resource_for_web_client(self): def build_resource_for_web_client(self):
return File("webclient") # TODO configurable? syweb_path = os.path.dirname(syweb.__file__)
webclient_path = os.path.join(syweb_path, "webclient")
return File(webclient_path) # TODO configurable?
def build_resource_for_content_repo(self): def build_resource_for_content_repo(self):
return ContentRepoResource( return ContentRepoResource(