Merge branch 'master' into makefile-tests

1 files changed, 7 insertions, 4 deletions

diff --git a/service/pixelated/resources/__init__.py b/service/pixelated/resources/__init__.py
index 6bac2f59..f5512644 100644
--- a/service/pixelated/resources/__init__.py
+++ b/service/pixelated/resources/__init__.py
@@ -57,12 +57,15 @@ def handle_error_deferred(e, request):
     request.finish()
 
 
-def get_startup_folder():
-    path = os.path.dirname(os.path.abspath(__file__))
-    return os.path.join(path, '..', 'assets')
+def get_protected_static_folder():
+    return os.path.join(_get_static_folder(), 'protected')
 
 
-def get_static_folder():
+def get_public_static_folder():
+    return os.path.join(_get_static_folder(), 'public')
+
+
+def _get_static_folder():
     static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "dist"))
     if not os.path.exists(static_folder):
         static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent')