diff --git a/.github/ISSUE_TEMPLATE/1-bug_report.yml b/.github/ISSUE_TEMPLATE/1-bug_report.yml index f6e0b20c..4101b74f 100644 --- a/.github/ISSUE_TEMPLATE/1-bug_report.yml +++ b/.github/ISSUE_TEMPLATE/1-bug_report.yml @@ -191,7 +191,6 @@ body: In the meantime please consider: - 💰 [Donating to support ArchiveBox open-source](https://github.com/ArchiveBox/ArchiveBox/wiki/Donations) - - 👨‍✈️ [Hiring us for corporate deployments](https://docs.monadical.com/s/archivebox-consulting-services) with professional support, custom feature development, and help with CAPTCHAs/rate-limits - 🔍 [Searching the Documentation](https://docs.archivebox.io/) for answers to common questions - 📚 Reading the [Troubleshooting Guide](https://github.com/ArchiveBox/ArchiveBox/wiki) - ✨ Testing out a newer [`BETA` release](https://github.com/ArchiveBox/ArchiveBox/releases) (issues are often already fixed in our latest `BETA` releases) diff --git a/.github/ISSUE_TEMPLATE/2-feature_request.yml b/.github/ISSUE_TEMPLATE/2-feature_request.yml index b6985776..9dce2eb5 100644 --- a/.github/ISSUE_TEMPLATE/2-feature_request.yml +++ b/.github/ISSUE_TEMPLATE/2-feature_request.yml @@ -109,9 +109,6 @@ body: required: false - label: "I've had a lot of difficulty getting ArchiveBox set up" required: false - - label: "I would pay $10/mo for a hosted version of ArchiveBox if it had this feature" - required: false - - type: markdown attributes: value: | @@ -123,6 +120,5 @@ body: In the meantime please consider: - 💰 [Donating to support ArchiveBox open-source](https://github.com/ArchiveBox/ArchiveBox/wiki/Donations) - - 📊 [Hiring us for corporate deployments](https://docs.monadical.com/s/archivebox-consulting-services) with professional support, custom feature development, and help with CAPTCHAs/rate-limits - 🔍 [Searching the Documentation](https://docs.archivebox.io/) for answers to common questions - ✨ Testing out a newer [`BETA` release](https://github.com/ArchiveBox/ArchiveBox/releases) (issues are often already fixed in our latest `BETA` releases) diff --git a/.github/ISSUE_TEMPLATE/3-documentation_change.yml b/.github/ISSUE_TEMPLATE/3-documentation_change.yml index c711f089..3086cd89 100644 --- a/.github/ISSUE_TEMPLATE/3-documentation_change.yml +++ b/.github/ISSUE_TEMPLATE/3-documentation_change.yml @@ -47,6 +47,5 @@ body: In the meantime please consider: - 💰 [Donating to support ArchiveBox open-source](https://github.com/ArchiveBox/ArchiveBox/wiki/Donations) - - 👨‍✈️ [Hiring us for corporate deployments](https://docs.monadical.com/s/archivebox-consulting-services) with professional support, custom feature development, and help with CAPTCHAs/rate-limits - 🔍 [Checking out the new ReadTheDocs Documentation](https://docs.archivebox.io/) - ✨ Helping us test a newer [`BETA` release](https://github.com/ArchiveBox/ArchiveBox/releases) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 110053cc..37ff10df 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -6,6 +6,3 @@ contact_links: - name: 💬 Chat with the dev team & community on Zulip url: https://zulip.archivebox.io about: "Join us on our Zulip forum to chat with the developers and other users (it's similar to Discord but self-hosted)." - - name: 💁‍♂️ Hire us for professional support with fast response times - url: https://docs.monadical.com/s/archivebox-consulting-services - about: "We provide hosting, development, and support, including on-prem/cloud w/ SSO & storage, CAPTCHA-solving, proxies, etc." diff --git a/README.md b/README.md index fd3e3a58..8c6735b6 100644 --- a/README.md +++ b/README.md @@ -138,27 +138,6 @@ curl -fsSL 'https://get.archivebox.io' | bash
-## 🤝 Professional Integration - -ArchiveBox is free for everyone to self-host, but we also provide support, security review, and custom integrations to help NGOs, governments, and other organizations [run ArchiveBox professionally](https://zulip.archivebox.io/#narrow/stream/167-enterprise/topic/welcome/near/1191102): - -- **Journalists:** - `crawling during research`, `preserving cited pages`, `fact-checking & review` -- **Lawyers:** - `collecting & preserving evidence`, `detecting changes`, `tagging & review` -- **Researchers:** - `analyzing social media trends`, `getting LLM training data`, `crawling pipelines` -- **Individuals:** - `saving bookmarks`, `preserving portfolio content`, `legacy / memoirs archival` -- **Governments:** - `snapshotting public service sites`, `recordkeeping compliance` - -> ***[Contact us](https://zulip.archivebox.io/#narrow/stream/167-enterprise/topic/welcome/near/1191102)** if your org wants help using ArchiveBox professionally.* -> We offer: setup & support, CAPTCHA/ratelimit unblocking, SSO, audit logging/chain-of-custody, and more -> *ArchiveBox is a 🏛️ 501(c)(3) [nonprofit FSP](https://hackclub.com/hcb/) and all our work supports open-source development.* - -
-

grassgrass @@ -418,18 +397,9 @@ See below for usage examples using the CLI, W
-paid Paid hosting solutions (cloud VPS) +paid Third-party paid hosting options (cloud VPS)
-For more discussion on managed and paid hosting options see here: Issue #531. +For more discussion on third-party hosting options see here: Issue #531.
@@ -1015,7 +985,7 @@ archivebox config --set SERVER_SECURITY_MODE=safe-onedomain-nojsreplay ### Working Around Sites that Block Archiving -For various reasons, many large sites (Reddit, Twitter, Cloudflare, etc.) actively block archiving or bots in general. There are a number of approaches to work around this, and we also provide consulting services to help here. +For various reasons, many large sites (Reddit, Twitter, Cloudflare, etc.) actively block archiving or bots in general. There are a number of approaches to work around this.
@@ -1255,13 +1225,6 @@ ArchiveBox is neither the highest fidelity nor the simplest tool available for s
-**Need help building a custom archiving solution?** - -> ✨ **[Hire the team that built Archivebox](https://zulip.archivebox.io/#narrow/stream/167-enterprise/topic/welcome/near/1191102) to solve archiving for your org.** ([@ArchiveBoxApp](https://twitter.com/ArchiveBoxApp)) - -
- -
documentation graphic
@@ -1564,8 +1527,6 @@ Copy a similar plugin as a template to modify, then open a new PR to add it in t
-🏛️ Contact us for professional support 💬
-

      diff --git a/docs/Donations.md b/docs/Donations.md index 7066430c..d22e3b6b 100644 --- a/docs/Donations.md +++ b/docs/Donations.md @@ -4,7 +4,7 @@ (ArchiveBox is fiscally sponsored by HCB EIN: 81-2908499)
-**💬 [Hire us](https://docs.sweeting.me/s/archivebox-consulting-services)** to help your NGO/org with archiving, or donate to directly support ArchiveBox open-source development. +Donations directly support ArchiveBox open-source development. - ⭐️ **Direct donation via our `501(c)(3)` non-profit:** https://hcb.hackclub.com/donations/start/archivebox diff --git a/docs/Home.md b/docs/Home.md index f0c0ec44..c604896b 100644 --- a/docs/Home.md +++ b/docs/Home.md @@ -30,11 +30,7 @@
-**🏛️ [Need professional support? Hire Us](https://docs.sweeting.me/s/archivebox-consulting-services) 💬** - -
- -**✨ Or donate to support open-source development ✨** +**✨ Donate to support open-source development ✨** [![](https://img.shields.io/badge/Donate-Directly-%13DE5D26.svg)](https://hcb.hackclub.com/donations/start/archivebox) [![](https://img.shields.io/badge/Donate-Github_Sponsors-%23B7CDFE.svg)](https://github.com/sponsors/pirate) diff --git a/docs/Roadmap.md b/docs/Roadmap.md index 651f5116..71d38fc0 100644 --- a/docs/Roadmap.md +++ b/docs/Roadmap.md @@ -43,7 +43,7 @@ ... -### `v2.0 Federated or distributed archiving + paid hosted service offering` +### `v2.0 Federated or distributed archiving` - ZFS / merkel tree for storing archive output subresource hashes - DHT for assigning merkel tree hash:file shards to nodes - tag system for tagging certain hashes with human-readable names, e.g. title, url, tags, filetype etc. diff --git a/docs/Security-Overview.md b/docs/Security-Overview.md index 9d2b440b..a73606b0 100644 --- a/docs/Security-Overview.md +++ b/docs/Security-Overview.md @@ -1,8 +1,5 @@ # Security Overview -> *💬 We offer [consulting services](https://docs.monadical.com/s/archivebox-consulting-services) to set up, secure, and maintain ArchiveBox on your preferred hosting environment.* -> We use this revenue (from corporate clients who can afford to pay) to support open source development and keep ArchiveBox free. - ## Web UI Permissions ```bash diff --git a/docs/Setting-Up-Storage.md b/docs/Setting-Up-Storage.md index 3252bf29..a4ff81b1 100644 --- a/docs/Setting-Up-Storage.md +++ b/docs/Setting-Up-Storage.md @@ -1,10 +1,5 @@ # Setting Up Storage -> *💬 We offer [consulting services](https://docs.monadical.com/s/archivebox-consulting-services) to set up, secure, and maintain ArchiveBox on your preferred storage provider.* -> We use this revenue (from corporate clients who can afford to pay) to support open source development and keep ArchiveBox free. - -
- ArchiveBox supports a wide range of local and remote filesystems using `rclone` and/or Docker storage plugins. The examples below use [Docker Compose bind mounts](https://docs.docker.com/storage/bind-mounts/) to demonstrate the concepts; adapt the host paths, ownership, and provider settings to your environment. Example [`docker-compose.yml`](https://github.com/ArchiveBox/ArchiveBox/blob/dev/docker-compose.yml) storage setup: diff --git a/docs/Setting-up-Authentication.md b/docs/Setting-up-Authentication.md index a3d8fe6b..925717fc 100644 --- a/docs/Setting-up-Authentication.md +++ b/docs/Setting-up-Authentication.md @@ -1,24 +1,16 @@ # Setting Up Authentication -> *💬 We offer [consulting services](https://docs.monadical.com/s/archivebox-consulting-services) to set up, integrate, and maintain ArchiveBox with your org's auth & hosting. -> If you need support, advanced development to capture difficult sites, audit logging, and more, we can provide it!* -> We use this revenue (from corporate clients who can afford to pay) to support open source development and keep ArchiveBox free. - ---- - ArchiveBox supports several types of authentication for users logging in via the Admin Web UI or REST API. ## Set Up Admin Web UI Permissions -Non-admin user permissions are only available to paying ArchiveBox clients - Use these options to set up your desired permissions for non-admin guest users: - [`PUBLIC_INDEX=True`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#public_index): Default *allows* non-logged-in users to see Snapshot list - [`PUBLIC_ADD_VIEW=False`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#public_add_view): Default *doesn't allow* non-logged-in users to submit new URLs - [`PERMISSIONS=public`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#permissions): Default *allows* non-logged-in users to see Snapshot content (set to `unlisted` or `private` to gate it; replaces the removed legacy `PUBLIC_SNAPSHOTS` toggle, which was a global on/off — `PERMISSIONS` is now per-Snapshot) > [!NOTE] -> **Open source ArchiveBox does not support setting up *non-admin* users** & groups with custom permissions. We do offer this feature, audit logging, and more to [paying clients](https://docs.monadical.com/s/archivebox-consulting-services). +> ArchiveBox does not currently support setting up *non-admin* users and groups with custom permissions. - [Wiki: Configuration](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#permissions) (`PUBLIC_INDEX`, `PUBLIC_ADD_VIEW`, `PERMISSIONS`) - [Wiki: Security Overview](https://github.com/ArchiveBox/ArchiveBox/wiki/Security-Overview)