move state outside envs

so it can be managed separately more easily
This commit is contained in:
Min RK
2018-07-18 23:15:36 -07:00
parent 24b535d524
commit 00797b404c
3 changed files with 4 additions and 5 deletions

View File

@@ -13,8 +13,7 @@ from ruamel.yaml import YAML
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(HUB_ENV_PREFIX, 'state')
STATE_DIR = os.path.join(INSTALL_PREFIX, 'state')
HERE = os.path.abspath(os.path.dirname(__file__))

View File

@@ -14,7 +14,7 @@ PrivateTmp=yes
PrivateDevices=yes
ProtectKernelTunables=yes
ProtectKernelModules=yes
EnvironmentFile={install_prefix}/hub/state/configurable-http-proxy.secret
EnvironmentFile={install_prefix}/state/configurable-http-proxy.secret
# Set PATH so env can find correct node
Environment=PATH=$PATH:{install_prefix}/hub/bin
ExecStart={install_prefix}/hub/bin/configurable-http-proxy \

View File

@@ -10,14 +10,14 @@ User=root
Restart=always
# jupyterhub process should have no access to home directories
ProtectHome=tmpfs
WorkingDirectory={install_prefix}/hub/state
WorkingDirectory={install_prefix}/state
# Protect bits that are normally shared across the system
PrivateTmp=yes
PrivateDevices=yes
ProtectKernelTunables=yes
ProtectKernelModules=yes
# Source CONFIGPROXY_AUTH_TOKEN from here!
EnvironmentFile={install_prefix}/hub/state/configurable-http-proxy.secret
EnvironmentFile={install_prefix}/state/configurable-http-proxy.secret
Environment=TLJH_INSTALL_PREFIX={install_prefix}
ExecStart={python_interpreter_path} -m jupyterhub.app -f {jupyterhub_config_path}