zhangyiss/the-littlest-jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/the-littlest-jupyterhub.git synced 2025-12-18 21:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

consolidate paths in config.py

Browse Source
This commit is contained in:
Min RK
2018-07-31 12:02:47 +02:00
parent 75ffa91c85
commit 2760e1adcd
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tljh/config.py
View File

@@ -11,6 +11,8 @@ tljh-config show firstlevel
tljh-config show firstlevel.second_level
"""
import os
import sys
import argparse
from ruamel.yaml import YAML
@@ -18,6 +20,13 @@ from copy import deepcopy
from tljh import systemd, traefik
INSTALL_PREFIX = os.environ.get('TLJH_INSTALL_PREFIX', '/opt/tljh')
HUB_ENV_PREFIX = os.path.join(INSTALL_PREFIX, 'hub')
USER_ENV_PREFIX = os.path.join(INSTALL_PREFIX, 'user')
STATE_DIR = os.path.join(INSTALL_PREFIX, 'state')
CONFIG_FILE = os.path.join(INSTALL_PREFIX, 'config.yaml')
yaml = YAML(typ='rt')
@@ -156,8 +165,7 @@ def reload_component(component):
# FIXME: Verify hub is back up?
print('Hub reload with new configuration complete')
elif component == 'proxy':
# FIXME: How to set path here?
traefik.ensure_traefik_config('/opt/tljh/hub/state')
traefik.ensure_traefik_config(STATE_DIR)
systemd.restart_service('configurable-http-proxy')
systemd.restart_service('traefik')
print('Proxy reload with new configuration complete')

3
tljh/configurer.py
View File

@@ -11,8 +11,7 @@ FIXME: A strong feeling that JSON Schema should be involved somehow.
import os
import yaml
INSTALL_PREFIX = os.environ.get('TLJH_INSTALL_PREFIX', '/opt/tljh')
CONFIG_FILE = os.path.join(INSTALL_PREFIX, 'config.yaml')
from tljh.config import CONFIG_FILE
# Default configuration for tljh
# User provided config is merged into this

6
tljh/installer.py
View File

@@ -11,11 +11,7 @@ from urllib.request import urlopen, URLError
from ruamel.yaml import YAML
from tljh import conda, systemd, traefik, user, apt
INSTALL_PREFIX = os.environ.get('TLJH_INSTALL_PREFIX', '/opt/tljh')
HUB_ENV_PREFIX = os.path.join(INSTALL_PREFIX, 'hub')
USER_ENV_PREFIX = os.path.join(INSTALL_PREFIX, 'user')
STATE_DIR = os.path.join(INSTALL_PREFIX, 'state')
from tljh.config import INSTALL_PREFIX, HUB_ENV_PREFIX, USER_ENV_PREFIX, STATE_DIR
HERE = os.path.abspath(os.path.dirname(__file__))

10
tljh/jupyterhub_config.py
View File

@@ -1,14 +1,14 @@
"""
JupyterHub config for the littlest jupyterhub.
"""
import copy
import os
import yaml
from systemdspawner import SystemdSpawner
from tljh import user, configurer
import yaml
import copy
INSTALL_PREFIX = os.environ.get('TLJH_INSTALL_PREFIX')
USER_ENV_PREFIX = os.path.join(INSTALL_PREFIX, 'user')
from tljh.config import INSTALL_PREFIX, USER_ENV_PREFIX
class CustomSpawner(SystemdSpawner):