Skip to content
Permalink
Browse files

server: move SERVER_STATIC_ROOT from core to server

Signed-off-by: Florian Scherf <f.scherf@pengutronix.de>
  • Loading branch information...
fscherf committed Aug 13, 2019
1 parent 1e3c881 commit b9c6cdd9415702de858ce61ac0446cca02f247f9
Showing with 6 additions and 3 deletions.
  1. +1 −1 bin/_flamingo-server
  2. +2 −2 flamingo/__init__.py
  3. +3 −0 flamingo/server/__init__.py
@@ -14,12 +14,12 @@ from aiohttp_json_rpc import JsonRpc
from flamingo.core.utils.cli import gen_default_parser, parse_args
from flamingo.core.utils.aiohttp import no_cache
from flamingo.core.data_model import Q
from flamingo import SERVER_STATIC_ROOT

from flamingo.server.build_environment import BuildEnvironment
from flamingo.server.watcher import Flags, DiscoveryWatcher
from flamingo.server.exporter import ContentExporter
from flamingo.server.logging import RPCHandler
from flamingo.server import SERVER_STATIC_ROOT


def default_exeption_handler(loop, context):
@@ -2,10 +2,10 @@

from flamingo.core.plugins.hooks import hook # NOQA

VERSION = (0, 10, 2)
_dirname = os.path.dirname(__file__)

VERSION = (0, 10, 2)
VERSION_STRING = '.'.join([str(i) for i in VERSION])
SERVER_STATIC_ROOT = os.path.join(_dirname, 'server/static')
THEME_ROOT = os.path.join(_dirname, 'theme')
PROJECT_TEMPLATES_ROOT = os.path.join(_dirname, 'project_templates')

@@ -0,0 +1,3 @@
import os

SERVER_STATIC_ROOT = os.path.join(os.path.dirname(__file__), 'static')

0 comments on commit b9c6cdd

Please sign in to comment.
You can’t perform that action at this time.