Try fix nginx X-accel-redirect

usegalaxy-au · Jan 16, 2025 · ed17518 · ed17518
1 parent b51dab8
commit ed17518
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/app/settings/base.py b/app/app/settings/base.py
@@ -33,7 +33,7 @@
 MEDIA_ROOT = BASE_DIR / 'app/media'
 LOG_ROOT = ensure_dir(BASE_DIR / 'app/logs')
 TEMP_DIR = ensure_dir(os.getenv('TMP_DIR', '/tmp/labs_engine/'))
-INTERNAL_ROOT = TEMP_DIR
+INTERNAL_ROOT = TEMP_DIR / 'internal'
 DEFAULT_EXPORTED_LAB_CONTENT_ROOT = (
     f'http://{HOSTNAME}/static/labs/content/docs/base.yml')
 

diff --git a/app/labs/bootstrap.py b/app/labs/bootstrap.py
@@ -36,8 +36,8 @@ def random_string(length):
 
 def lab(form_data):
     """Render a new lab from form data."""
-    clean_dir(settings.TEMP_DIR)
-    output_dir = settings.TEMP_DIR / random_string(6)
+    clean_dir(settings.INTERNAL_ROOT)
+    output_dir = settings.INTERNAL_ROOT / random_string(6)
     form_data['logo_filename'] = create_logo(form_data, output_dir)
     render_templates(form_data, output_dir)
     render_server_yml(form_data, output_dir)
@@ -46,7 +46,7 @@ def lab(form_data):
     with zipfile.ZipFile(zipfile_path, 'w') as zf:
         for path in output_dir.rglob('*'):
             zf.write(path, root_dir / path.relative_to(output_dir))
-    return Path(str(zipfile_path).replace(str(settings.TEMP_DIR), ''))
+    return Path(str(zipfile_path).replace(str(settings.INTERNAL_ROOT), ''))
 
 
 def render_templates(data, output_dir):