Determine webclient path by the python module it is contained in

pull/4/merge
Mark Haines 10 years ago
parent 4e52f9699b
commit dca3ba2f77
  1. 2
      demo/start.sh
  2. 5
      synapse/app/homeserver.py

@ -41,6 +41,6 @@ for port in 8080 8081 8082; do
done
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"

@ -42,6 +42,7 @@ import os
import re
import sys
import sqlite3
import syweb
logger = logging.getLogger(__name__)
@ -58,7 +59,9 @@ class SynapseHomeServer(HomeServer):
return JsonResource()
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):
return ContentRepoResource(

Loading…
Cancel
Save