Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix traefik config reload #88

Merged
merged 3 commits into from
Jul 31, 2018
Merged

Fix traefik config reload #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75ffa91
Fix traefik config reload
yuvipanda Jul 31, 2018
2760e1a
consolidate paths in config.py
minrk Jul 31, 2018
c6654ae
avoid circular imports
minrk Jul 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions tljh/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,19 @@

tljh-config show firstlevel.second_level
"""

import os
import sys
import argparse
from ruamel.yaml import YAML
from copy import deepcopy
from tljh import systemd


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')
Expand All @@ -28,7 +36,7 @@ def set_item_in_config(config, property_path, value):
config is not mutated.

property_path is a series of dot separated values. Any part of the path
that does not exist is created.
that does not exist is created.
"""
path_components = property_path.split('.')

Expand Down Expand Up @@ -151,11 +159,14 @@ def reload_component(component):

component can be 'hub' or 'proxy'.
"""
# import here to avoid circular imports
from tljh import systemd, traefik
if component == 'hub':
systemd.restart_service('jupyterhub')
# FIXME: Verify hub is back up?
print('Hub reload with new configuration complete')
elif component == 'proxy':
traefik.ensure_traefik_config(STATE_DIR)
systemd.restart_service('configurable-http-proxy')
systemd.restart_service('traefik')
print('Proxy reload with new configuration complete')
Expand Down
3 changes: 1 addition & 2 deletions tljh/configurer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
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
Expand Down
6 changes: 1 addition & 5 deletions tljh/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
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__))

Expand Down
10 changes: 5 additions & 5 deletions tljh/jupyterhub_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"""
JupyterHub config for the littlest jupyterhub.
"""
import copy
import os
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 systemdspawner import SystemdSpawner
from tljh import user, configurer
from tljh.config import INSTALL_PREFIX, USER_ENV_PREFIX


class CustomSpawner(SystemdSpawner):
Expand Down