Merge branch 'boilerplate-generator' into dev

ansible/group_vars/webservers.yml

@@ -40,6 +40,7 @@ create_directories:
   - "{{ config_root }}"
   - "{{ django_root }}/app/media"
   - "{{ django_root }}/app/logs"
+  - "{{ temp_dir }}"
 
 # Admin user login for the web admin
 admin_user:

ansible/roles/galaxy_labs_engine/defaults/main.yml

@@ -11,6 +11,7 @@ nginx_limit_requests_per_minute: 10
 project_root: /home/ubuntu/labs-engine
 config_root: /home/ubuntu/config
 django_root: "{{ project_root }}/app"
+temp_dir: /tmp/labs_engine
 
 labs_engine:
   templates:

ansible/roles/galaxy_labs_engine/templates/.env.j2

@@ -21,6 +21,8 @@ GITHUB_API_TOKEN={{ github_api_token }}
 LOG_LEVEL_CONSOLE={{ django_log_levels.console|upper }}
 LOG_LEVEL_CACHE={{ django_log_levels.cache|upper }}
 
+TMP_DIR={{ temp_dir }}
+
 {% if django_sentry_dns %}
 SENTRY_DNS={{ django_sentry_dns }}
 {% endif %}

app/app/settings/base.py

@@ -42,7 +42,7 @@
 STATIC_ROOT = BASE_DIR / 'app/static'
 MEDIA_ROOT = BASE_DIR / 'app/media'
 LOG_ROOT = ensure_dir(BASE_DIR / 'app/logs')
-TEMP_DIR = ensure_dir(BASE_DIR / 'app/temp')
+TEMP_DIR = ensure_dir(os.getenv('TMP_DIR', '/tmp/labs_engine/'))
 DEFAULT_EXPORTED_LAB_CONTENT_ROOT = (
     f'http://{HOSTNAME}/static/labs/content/docs/base.yml')
 

app/labs/bootstrap.py

@@ -10,7 +10,7 @@
 from django.utils.text import slugify
 from pathlib import Path
 
-HOURS_72 = 3 * 24 * 60 * 60
+HOURS_1 = 60 * 60
 ALPHANUMERIC = string.ascii_letters + string.digits
 TEMPLATE_DIR = Path('labs/bootstrap')
 TEMPLATES_TO_RENDER = [
@@ -111,6 +111,6 @@ def create_logo(data, output_dir):
 def clean_dir(directory):
     """Delete directories that were created more than 7 days ago."""
     for path in directory.iterdir():
-        if path.is_dir() and path.stat().st_ctime < time.time() - HOURS_72:
+        if path.is_dir() and path.stat().st_ctime < time.time() - HOURS_1:
             shutil.rmtree(path)
     return directory