From 00797b404c990e4e46a67aca06dd37e0b6c57643 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 18 Jul 2018 23:15:36 -0700 Subject: [PATCH] move state outside envs so it can be managed separately more easily --- tljh/installer.py | 3 +-- tljh/systemd-units/configurable-http-proxy.service | 2 +- tljh/systemd-units/jupyterhub.service | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tljh/installer.py b/tljh/installer.py index a68652c..15ab952 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -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__)) diff --git a/tljh/systemd-units/configurable-http-proxy.service b/tljh/systemd-units/configurable-http-proxy.service index 483028a..2b983e6 100644 --- a/tljh/systemd-units/configurable-http-proxy.service +++ b/tljh/systemd-units/configurable-http-proxy.service @@ -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 \ diff --git a/tljh/systemd-units/jupyterhub.service b/tljh/systemd-units/jupyterhub.service index a653592..dd94868 100644 --- a/tljh/systemd-units/jupyterhub.service +++ b/tljh/systemd-units/jupyterhub.service @@ -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}