From 11d473e536e080a539ab738db0dd93c335dfae2c Mon Sep 17 00:00:00 2001 From: Ben Muthalaly Date: Sat, 14 Oct 2023 00:38:04 -0500 Subject: [PATCH] Add config options to add admin user on first run --- archivebox/config.py | 2 ++ archivebox/main.py | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/archivebox/config.py b/archivebox/config.py index 795b98e9..6fd6621c 100644 --- a/archivebox/config.py +++ b/archivebox/config.py @@ -91,6 +91,8 @@ CONFIG_SCHEMA: Dict[str, ConfigDefaultDict] = { 'OUTPUT_PERMISSIONS': {'type': str, 'default': '644'}, 'RESTRICT_FILE_NAMES': {'type': str, 'default': 'windows'}, 'URL_BLACKLIST': {'type': str, 'default': r'\.(css|js|otf|ttf|woff|woff2|gstatic\.com|googleapis\.com/css)(\?.*)?$'}, # to avoid downloading code assets as their own pages + 'ARCHIVEBOX_USERNAME': {'type': str, 'default': None}, + 'ARCHIVEBOX_PASSWORD': {'type': str, 'default': None}, 'URL_WHITELIST': {'type': str, 'default': None}, 'ENFORCE_ATOMIC_WRITES': {'type': bool, 'default': True}, 'TAG_SEPARATOR_PATTERN': {'type': str, 'default': r'[,]'}, diff --git a/archivebox/main.py b/archivebox/main.py index 5878185c..87dd8899 100755 --- a/archivebox/main.py +++ b/archivebox/main.py @@ -112,6 +112,8 @@ from .config import ( load_all_config, CONFIG, USER_CONFIG, + ARCHIVEBOX_USERNAME, + ARCHIVEBOX_PASSWORD, get_real_name, setup_django, ) @@ -422,7 +424,10 @@ def init(force: bool=False, quick: bool=False, setup: bool=False, out_dir: Path= if existing_index: print('{green}[√] Done. Verified and updated the existing ArchiveBox collection.{reset}'.format(**ANSI)) else: - # TODO: allow creating new supersuer via env vars on first init + if ARCHIVEBOX_USERNAME and ARCHIVEBOX_PASSWORD: + print('{green}[+] ARCHIVEBOX_USERNAME and ARCHIVEBOX_PASSWORD configuration options found. Creating new admin user with username {} and password {}.{reset}'.format(ARCHIVEBOX_USERNAME, ARCHIVEBOX_PASSWORD, **ANSI)) + from django.contrib.auth.models import User + User.objects.create_superuser(username=ARCHIVEBOX_USERNAME, password=ARCHIVEBOX_PASSWORD) # if config.HTTP_USER and config.HTTP_PASS: # from django.contrib.auth.models import User # User.objects.create_superuser(HTTP_USER, '', HTTP_PASS)