From 37bdcbf9504e36cb20f9e653129ff429f05b2436 Mon Sep 17 00:00:00 2001 From: Vladimir D Date: Wed, 6 Dec 2023 16:16:51 +0400 Subject: [PATCH 1/3] make local auth working along with ldap auth so that local superuser could manage ldap users --- archivebox/core/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py index 11fd649d..5b44898b 100644 --- a/archivebox/core/settings.py +++ b/archivebox/core/settings.py @@ -124,6 +124,7 @@ if LDAP: } AUTHENTICATION_BACKENDS = [ + 'django.contrib.auth.backends.ModelBackend', 'django_auth_ldap.backend.LDAPBackend', ] except ModuleNotFoundError: From 43128122d6391dd18a7f2884f897952f91cf70db Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 19 Dec 2023 08:25:51 -0800 Subject: [PATCH 2/3] Update README.md minor formatting changes --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 94ef4154..00eb979b 100644 --- a/README.md +++ b/README.md @@ -47,10 +47,10 @@ Without active preservation effort, everything on the internet eventually dissap 💾 **It saves snapshots of the URLs you feed it in several redundant formats.** It also detects any content featured *inside* each webpage & extracts it out into a folder: -- `HTML/Generic Websites -> HTML, PDF, PNG, WARC, Singlefile` +- `HTML/Generic websites -> HTML, PDF, PNG, WARC, Singlefile` - `YouTube/SoundCloud/etc. -> MP3/MP4 + subtitles, description, thumbnail` -- `news articles -> article body TXT + title, author, featured images` -- `github/gitlab/etc. links -> git cloned source code` +- `News articles -> article body TXT + title, author, featured images` +- `Github/Gitlab/etc. links -> git cloned source code` - *[and more...](#output-formats)* It uses normal filesystem folders to organize archives (no complicated proprietary formats), and offers a CLI + web UI. @@ -151,7 +151,7 @@ ls ./archive/*/index.json # or browse directly via the filesyste # Quickstart -**🖥  Supported OSs:** Linux/BSD, macOS, Windows (Docker)   **👾  CPUs:** `amd64` (`x86_64`), `arm64` (`arm8`), `arm7` (raspi>=3) +**🖥  Supported OSs:** Linux/BSD, macOS, Windows (Docker)   **👾  CPUs:** `amd64` (`x86_64`), `arm64` (`arm8`), `arm7` (raspi>=3)
Note: On `arm7`, the `playwright` package, provides easy `chromium` management, is not yet available. Do it manually with alternative methods.
From 1f33fc73c94103a9fc12c9883280f3c0d9246672 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 19 Dec 2023 08:30:37 -0800 Subject: [PATCH 3/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 00eb979b..ff3f57c7 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,7 @@ ls ./archive/*/index.json # or browse directly via the filesyste # Quickstart **🖥  Supported OSs:** Linux/BSD, macOS, Windows (Docker)   **👾  CPUs:** `amd64` (`x86_64`), `arm64` (`arm8`), `arm7` (raspi>=3)
-Note: On `arm7`, the `playwright` package, provides easy `chromium` management, is not yet available. Do it manually with alternative methods. +Note: On `arm7` the `playwright` package is not available, so `chromium` must be installed manually if needed.
@@ -161,7 +161,7 @@ ls ./archive/*/index.json # or browse directly via the filesyste
Docker docker-compose (macOS/Linux/Windows)   👈  recommended   (click to expand)
-👍 Docker Compose is recommended for the easiest install/update UX + best security + all the extras working out-of-the-box. +👍 Docker Compose is recommended for the easiest install/update UX + best security + all the extras out-of-the-box.

  1. Install Docker and Docker Compose on your system (if not already installed).