Skip to content
Snippets Groups Projects
Commit dca3ba2f authored by Mark Haines's avatar Mark Haines
Browse files

Determine webclient path by the python module it is contained in

parent 4e52f969
No related branches found
No related tags found
No related merge requests found
...@@ -41,6 +41,6 @@ for port in 8080 8081 8082; do ...@@ -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"
...@@ -42,6 +42,7 @@ import os ...@@ -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): ...@@ -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(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment