Skip to content

Commit 6c54fca

Browse files
committed
update url paths
1 parent 3a33392 commit 6c54fca

15 files changed

+57
-56
lines changed

Changelog.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Changelog
22

3-
▶️ *If you're having an issue with a breaking change, or migrating your data between versions, open an [issue](https://github.com/pirate/ArchiveBox/issues) to get help.*
3+
▶️ *If you're having an issue with a breaking change, or migrating your data between versions, open an [issue](https://github.com/ArchiveBox/ArchiveBox/issues) to get help.*
44

55
**`ArchiveBox` was previously named `Pocket Archive Stream` and then `Bookmark Archiver`.**
66

77
<br/>
88

99
<div align="center">
1010

11-
See the [releases](https://github.com/pirate/ArchiveBox/releases) page for versioned source downloads and full changelog.
11+
See the [releases](https://github.com/ArchiveBox/ArchiveBox/releases) page for versioned source downloads and full changelog.
1212
🍰 Many thanks to our 30+ contributors and everyone in the web archiving community! 🏛
1313

1414
</div>
@@ -19,7 +19,7 @@ See the [releases](https://github.com/pirate/ArchiveBox/releases) page for versi
1919
- `pip install archivebox` https://pypi.org/project/archivebox/
2020
- `docker run nikisweeting/archivebox` https://hub.docker.com/r/nikisweeting/archivebox
2121
- https://archivebox.readthedocs.io/en/latest/
22-
- https://github.com/pirate/ArchiveBox/releases
22+
- https://github.com/ArchiveBox/ArchiveBox/releases
2323
- easy migration from previous versions
2424
```bash
2525
cd path/to/your/archive/folder
@@ -33,7 +33,7 @@ See the [releases](https://github.com/pirate/ArchiveBox/releases) page for versi
3333
- new subcommands-based CLI for `archivebox` (see below)
3434
- new Web UI with pagination, better search, filtering, permissions, and more
3535
- 30+ assorted bugfixes, new features, and tickets closed
36-
- for more info, see: https://github.com/pirate/ArchiveBox/releases/tag/v0.4.9
36+
- for more info, see: https://github.com/ArchiveBox/ArchiveBox/releases/tag/v0.4.9
3737

3838
---
3939

@@ -81,7 +81,7 @@ See the [releases](https://github.com/pirate/ArchiveBox/releases) page for versi
8181

8282
---
8383
- v0.2.0 released with new name
84-
- [renamed](https://github.com/pirate/ArchiveBox/issues/108) from **Bookmark Archiver** -> **ArchiveBox**
84+
- [renamed](https://github.com/ArchiveBox/ArchiveBox/issues/108) from **Bookmark Archiver** -> **ArchiveBox**
8585

8686
---
8787
- v0.1.0 released
@@ -104,10 +104,10 @@ See the [releases](https://github.com/pirate/ArchiveBox/releases) page for versi
104104
- Index links now work without nginx url rewrites, archive can now be hosted on github pages
105105
- added setup.sh script & docstrings & help commands
106106
- made Chromium the default instead of Google Chrome (yay free software)
107-
- added [env-variable](https://github.com/pirate/ArchiveBox/pull/25) configuration (thanks to https://github.com/hannah98!)
107+
- added [env-variable](https://github.com/ArchiveBox/ArchiveBox/pull/25) configuration (thanks to https://github.com/hannah98!)
108108
- renamed from **Pocket Archive Stream** -> **Bookmark Archiver**
109-
- added [Netscape-format](https://github.com/pirate/ArchiveBox/pull/20) export support (thanks to https://github.com/ilvar!)
110-
- added [Pinboard-format](https://github.com/pirate/ArchiveBox/pull/7) export support (thanks to https://github.com/sconeyard!)
109+
- added [Netscape-format](https://github.com/ArchiveBox/ArchiveBox/pull/20) export support (thanks to https://github.com/ilvar!)
110+
- added [Pinboard-format](https://github.com/ArchiveBox/ArchiveBox/pull/7) export support (thanks to https://github.com/sconeyard!)
111111
- front-page of HN, oops! apparently I have users to support now :grin:?
112112
- added Pocket-format export support
113113

Chromium-Install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ apt install google-chrome-beta
5050

5151
## Troubleshooting
5252

53-
If you encounter problems setting up Google Chrome or Chromium, see the [Troubleshooting](https://github.com/pirate/ArchiveBox/wiki/Troubleshooting#chromiumgoogle-chrome) page.
53+
If you encounter problems setting up Google Chrome or Chromium, see the [Troubleshooting](https://github.com/ArchiveBox/ArchiveBox/wiki/Troubleshooting#chromiumgoogle-chrome) page.

Configuration.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Configuration
22

3-
▶️ *The full ArchiveBox config file definition with defaults can be found here: [`archivebox/config.py`](https://github.com/pirate/ArchiveBox/blob/master/archivebox/config.py#L27).*
3+
▶️ *The full ArchiveBox config file definition with defaults can be found here: [`archivebox/config.py`](https://github.com/ArchiveBox/ArchiveBox/blob/master/archivebox/config.py#L27).*
44

55
Configuration of ArchiveBox is done by using the `archivebox config` command, modifying the `ArchiveBox.conf` file in the data folder, or by using environment variables. All three methods work equivalently when using Docker as well.
66

77
*Some equivalent examples of setting some configuration options:*
8-
```bash
8+
```bash[][]
99
archivebox config --set CHROME_BINARY=google-chrome-stable
1010
# OR
1111
echo "CHROME_BINARY=google-chrome-stable" >> ArchiveBox.conf
@@ -28,7 +28,7 @@ Environment variables take precedence over the config file, which is useful if y
2828

2929
<br/>
3030

31-
All the available config options are described in this document below, but can also be found along with examples in [`etc/ArchiveBox.conf.default`](https://github.com/pirate/ArchiveBox/blob/master/etc/ArchiveBox.conf.default). The code that loads the config is in [`archivebox/config/__init__.py`](https://github.com/pirate/ArchiveBox/blob/master/archivebox/config/__init__.py#L45).
31+
All the available config options are described in this document below, but can also be found along with examples in [`etc/ArchiveBox.conf.default`](https://github.com/ArchiveBox/ArchiveBox/blob/master/etc/ArchiveBox.conf.default). The code that loads the config is in [`archivebox/config/__init__.py`](https://github.com/ArchiveBox/ArchiveBox/blob/master/archivebox/config/__init__.py#L45).
3232

3333
---
3434

@@ -84,7 +84,7 @@ Maximum allowed download time for fetching media when `SAVE_MEDIA=True` in secon
8484
---
8585
#### `TEMPLATES_DIR`
8686
**Possible Values:** [`$REPO_DIR/archivebox/templates`]/`/path/to/custom/templates`/...
87-
Path to a directory containing custom index html templates for theming your archive output. Files found in the folder at the specified path can override any of the defaults in the [`archivebox/themes`](https://github.com/pirate/ArchiveBox/tree/master/archivebox/themes) directory. If you've used `django` before, this works exactly the same way that `django` template overrides work (because it uses `django` under the hood).
87+
Path to a directory containing custom index html templates for theming your archive output. Files found in the folder at the specified path can override any of the defaults in the [`archivebox/themes`](https://github.com/ArchiveBox/ArchiveBox/tree/master/archivebox/themes) directory. If you've used `django` before, this works exactly the same way that `django` template overrides work (because it uses `django` under the hood).
8888

8989
*Related options:*
9090
[`FOOTER_INFO`](#footer_info)
@@ -428,3 +428,4 @@ This can be installed using `npm install -g git+https://github.com/pirate/readab
428428

429429

430430
<img src="https://i.imgur.com/almAbwK.png" width="100%"/>
431+
[]:

Docker.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ docker run -v $PWD:/data -p 8000:8000 nikisweeting/archivebox server 0.0.0.0:800
3737

3838
## Docker Compose
3939

40-
An example [`docker-compose.yml`](https://github.com/pirate/ArchiveBox/blob/master/docker-compose.yml) config with ArchiveBox and an Nginx server to serve the archive is included in the project root. You can edit it as you see fit, or just run it as it comes out-of-the-box.
40+
An example [`docker-compose.yml`](https://github.com/ArchiveBox/ArchiveBox/blob/master/docker-compose.yml) config with ArchiveBox and an Nginx server to serve the archive is included in the project root. You can edit it as you see fit, or just run it as it comes out-of-the-box.
4141

4242
Just make sure you have a Docker version that's [new enough](https://docs.docker.com/compose/compose-file/) to support `version: 3` format:
4343

@@ -50,7 +50,7 @@ Docker version 18.09.1, build 4c52b90 # must be >= 17.04.0
5050

5151
```bash
5252
mkdir archivebox && cd archivebox
53-
wget https://raw.githubusercontent.com/pirate/ArchiveBox/master/docker-compose.yml
53+
wget https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/master/docker-compose.yml
5454
docker-compose up -d
5555
docker-compose run archivebox init
5656
docker-compose run archivebox manage createsuperuser
@@ -213,4 +213,4 @@ echo 'https://example.com' | docker run -it -v $PWD:/data -e FETCH_SCREENSHOT=Fa
213213
docker run -i -v --env-file=ArchiveBox.env nikisweeting/archivebox
214214
```
215215

216-
You can also edit the `data/ArchiveBox.conf` file directly and the changes will take effect on the next run.
216+
You can also edit the `data/ArchiveBox.conf` file directly and the changes will take effect on the next run.

Home.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
**❓If you need help or have a question, you can:**
1212
<!-- - 💬 Ask our community by joining the ArchiveBox IRC [chat room](http://webchat.freenode.net?channels=ArchiveBox&uio=d4)-->
13-
- 🐞 Open an [issue](https://github.com/pirate/ArchiveBox/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) in our bug tracker
13+
- 🐞 Open an [issue](https://github.com/ArchiveBox/ArchiveBox/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) in our bug tracker
1414
- 🗣 Reach out to me on [Twitter](https://twitter.com/theSquashSH)
1515
- 💠 Reach out to me via DM on [Patreon](https://patreon.com/theSquashSH) (you'll get the fastest response here)
1616

@@ -22,11 +22,11 @@
2222
<img src="https://i.imgur.com/viklZNG.png" width="30%" alt="Desktop index screenshot" align="top">
2323
<img src="https://i.imgur.com/RefWsXB.jpg" width="30%" alt="Desktop details page Screenshot"/><br/>
2424

25-
<a href="https://github.com/pirate/ArchiveBox">Readme</a> | <a href="https://archive.sweeting.me/">Demo</a> | <a href="https://github.com/pirate/ArchiveBox/wiki/Quickstart">Quickstart</a> | <a href="https://github.com/pirate/ArchiveBox/wiki/Usage">Usage</a> | <a href="https://github.com/pirate/ArchiveBox/wiki/Web-Archiving-Community">Community</a>
25+
<a href="https://github.com/ArchiveBox/ArchiveBox">Readme</a> | <a href="https://archive.sweeting.me/">Demo</a> | <a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Quickstart">Quickstart</a> | <a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Usage">Usage</a> | <a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Web-Archiving-Community">Community</a>
2626

2727
<br/>
2828
<hr/>
2929

3030
[![](https://img.shields.io/badge/Donate-Patreon-%23DD5D76.svg)](https://www.patreon.com/theSquashSH)
3131

32-
</div>
32+
</div>

Quickstart.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
▶️ *It only takes about 5 minutes to get up and running with ArchiveBox.*
88

9-
ArchiveBox [officially supports](https://github.com/pirate/ArchiveBox/wiki/Install#supported-systems) **macOS**, **Ubuntu/Debian**, and **BSD**, but likely runs on many other systems. You can run it on any system that supports **Docker**, including Windows (using Docker in WSL2).
9+
ArchiveBox [officially supports](https://github.com/ArchiveBox/ArchiveBox/wiki/Install#supported-systems) **macOS**, **Ubuntu/Debian**, and **BSD**, but likely runs on many other systems. You can run it on any system that supports **Docker**, including Windows (using Docker in WSL2).
1010

1111
If you want to use Docker or Docker Compose to run ArchiveBox, see the [[Docker]] page.
1212

1313
---
1414

15-
First, we install the ArchiveBox [dependencies](./Install#dependencies), then we create a folder to [store the archive data](https://github.com/pirate/ArchiveBox/wiki/Usage#Disk-Layout), and finally, we [import the list of links](https://github.com/pirate/ArchiveBox/wiki/Usage#CLI-Usage) to the archive by running:
15+
First, we install the ArchiveBox [dependencies](./Install#dependencies), then we create a folder to [store the archive data](https://github.com/ArchiveBox/ArchiveBox/wiki/Usage#Disk-Layout), and finally, we [import the list of links](https://github.com/ArchiveBox/ArchiveBox/wiki/Usage#CLI-Usage) to the archive by running:
1616
`archivebox add < [links_file]`
1717

1818
## 1. Set up ArchiveBox
@@ -27,7 +27,7 @@ docker run -v $PWD:/data -it nikisweeting/archivebox init
2727

2828
# alternatively, install ArchiveBox and its dependencies directly on your system without docker
2929
# (script prompts for user confirmation before installing anything)
30-
curl https://raw.githubusercontent.com/pirate/ArchiveBox/master/bin/setup.sh | sh
30+
curl https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/master/bin/setup.sh | sh
3131
# or follow the manual setup instructions if you don't like using curl | sh
3232
```
3333

Roadmap.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<img src="https://i.imgur.com/es97GGV.png" width="20%" align="right"/>
44

55
▶️ *Comment here to discuss the contribution roadmap:
6-
[Official Roadmap Discussion](https://github.com/pirate/ArchiveBox/issues/120).*
6+
[Official Roadmap Discussion](https://github.com/ArchiveBox/ArchiveBox/issues/120).*
77

88
---
99

@@ -81,7 +81,7 @@
8181
- full-text search of extracted text with elasticsearch/elasticlunr/ag
8282
- download closed-caption subtitles from Youtube and other video sites for full-text indexing of video content
8383
- try pulling dead sites from archive.org and other sources if original is down (https://github.com/hartator/wayback-machine-downloader)
84-
- And more in the [issues list](https://github.com/pirate/ArchiveBox/issues/)...
84+
- And more in the [issues list](https://github.com/ArchiveBox/ArchiveBox/issues/)...
8585

8686
---
8787

@@ -93,7 +93,7 @@
9393
## Past Releases
9494

9595
To see how this spec has been scheduled / implemented / released so far, read these pull requests:
96-
-[v0.2.x](https://github.com/pirate/ArchiveBox/tree/483a3bef9e2b1a7b80611947a3be99b0cf4f9959)
97-
-[v0.3.x](https://github.com/pirate/ArchiveBox/pull/197)
98-
-[v0.4.x](https://github.com/pirate/ArchiveBox/pull/207)
99-
- 🛠 [v0.5.x](https://github.com/pirate/ArchiveBox/pull/275)
96+
-[v0.2.x](https://github.com/ArchiveBox/ArchiveBox/tree/483a3bef9e2b1a7b80611947a3be99b0cf4f9959)
97+
-[v0.3.x](https://github.com/ArchiveBox/ArchiveBox/pull/197)
98+
-[v0.4.x](https://github.com/ArchiveBox/ArchiveBox/pull/207)
99+
- 🛠 [v0.5.x](https://github.com/ArchiveBox/ArchiveBox/pull/275)

Scheduled-Archiving.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ArchiveBox ignores links that are imported multiple times (keeping the earliest
88
This means you can add cron jobs that regularly poll the same file or URL for new links, adding only new
99
ones as necessary.
1010

11-
For some example configs, see the [`etc/cron.d`](https://github.com/pirate/ArchiveBox/blob/master/etc/cron.d) and [`etc/supervisord`](https://github.com/pirate/ArchiveBox/blob/master/etc/supervisord) folders.
11+
For some example configs, see the [`etc/cron.d`](https://github.com/ArchiveBox/ArchiveBox/blob/master/etc/cron.d) and [`etc/supervisord`](https://github.com/ArchiveBox/ArchiveBox/blob/master/etc/supervisord) folders.
1212

1313
## Examples
1414

Security-Overview.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This mode should not be used for archiving entire browser history or authenticat
2828

2929
~~ArchiveBox is designed to be able to archive content that requires authentication or cookies. This includes paywalled content, private forums, LAN-only content, etc.~~
3030

31-
~~To get started, set [`CHROME_USER_DATA_DIR`](https://github.com/pirate/ArchiveBox/wiki/Configuration#chrome_user_data_dir) and [`COOKIES_FILE`](https://github.com/pirate/ArchiveBox/wiki/Configuration#COOKIES_FILE) to point to a Chrome user folder that has your sessions and a wget `cookies.txt` file respectively.~~
31+
~~To get started, set [`CHROME_USER_DATA_DIR`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#chrome_user_data_dir) and [`COOKIES_FILE`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#COOKIES_FILE) to point to a Chrome user folder that has your sessions and a wget `cookies.txt` file respectively.~~
3232

3333
~~If you're importing private links or authenticated content, you probably don't want to share your archive folder publicly on a webserver, so don't follow the [[Publishing Your Archive]] instructions unless you are only serving it on a trusted LAN or have some sort of authentication in front of it. Make sure to point ArchiveBox to an output folder with conservative permissions, as it may contain archived content with secret session tokens or pieces of your user data. You may also wish to encrypt the archive using an encrypted disk image or filesystem like ZFS as it will contain all requests and response data, including session keys, user data, usernames, etc.~~
3434

@@ -38,8 +38,8 @@ This mode should not be used for archiving entire browser history or authenticat
3838

3939
~~If you want ArchiveBox to be less noisy and avoid leaking any URLs to 3rd-party APIs during archiving, you can disable the options below. Disabling these are recommended if you plan on archiving any sites that use secret tokens in the URL to grant access to private content without authentication, e.g. Google Docs, CodiDM notepads, etc.~~
4040

41-
- `https://web.archive.org/save/{url}` when [`SUBMIT_ARCHIVE_DOT_ORG`](https://github.com/pirate/ArchiveBox/wiki/Configuration#submit_archive_dot_org) is `True`, full URLs are submitted to the Wayback Machine for archiving, but no cookies or content from the local authenticated archive are shared
42-
- `https://www.google.com/s2/favicons?domain={domain}` when [`FETCH_FAVICON`](https://github.com/pirate/ArchiveBox/wiki/Configuration#fetch_favicon) is `True`, the domains for each link are shared in order to get the favicon, but not the full URL~~
41+
- `https://web.archive.org/save/{url}` when [`SUBMIT_ARCHIVE_DOT_ORG`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#submit_archive_dot_org) is `True`, full URLs are submitted to the Wayback Machine for archiving, but no cookies or content from the local authenticated archive are shared
42+
- `https://www.google.com/s2/favicons?domain={domain}` when [`FETCH_FAVICON`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#fetch_favicon) is `True`, the domains for each link are shared in order to get the favicon, but not the full URL~~
4343

4444
## Do not run as root
4545

@@ -60,15 +60,15 @@ chown -R archivebox:archivebox /home/archivebox
6060
sudo -u archivebox archivebox add ...
6161
```
6262

63-
~~If you absolutely must run it as root for some reason, a footgun is provided: you can set [`ALLOW_ROOT=True`](https://github.com/pirate/ArchiveBox/wiki/Configuration#ALLOW_ROOT) via environment variable or in your ArchiveBox.conf file.~~ It was removed.
63+
~~If you absolutely must run it as root for some reason, a footgun is provided: you can set [`ALLOW_ROOT=True`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#ALLOW_ROOT) via environment variable or in your ArchiveBox.conf file.~~ It was removed.
6464

6565
<img src="https://i.imgur.com/ca1he6I.png" width="40px" align="right"/>
6666

6767
## Output Folder
6868

6969
### Permissions
7070

71-
What are the permissions on the archive folder? Limit access to the fewest possible users by checking folder ownership and setting [`OUTPUT_PERMISSIONS`](https://github.com/pirate/ArchiveBox/wiki/Configuration#OUTPUT_PERMISSIONS) accordingly.
71+
What are the permissions on the archive folder? Limit access to the fewest possible users by checking folder ownership and setting [`OUTPUT_PERMISSIONS`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#OUTPUT_PERMISSIONS) accordingly.
7272

7373
### Filesystem
7474

@@ -78,4 +78,4 @@ How much are you planning to archive? Only a few bookmarked articles, or thousa
7878

7979
Are you publishing your archive? If so, make sure you're only serving it as HTML and not accidentally running it as php or cgi, and put it on its own domain not shared with other services. This is done in order to avoid cookies leaking between your main domain and domains hosting content you don't control. Many companies put user provided files on separate domains like googleusercontent.com and github.io to avoid this problem.
8080

81-
Published archives automatically include a `robots.txt` `Dissallow: /` to block search engines from indexing them. You may still wish to publish your contact info in the index footer though using [`FOOTER_INFO`](https://github.com/pirate/ArchiveBox/wiki/Configuration#FOOTER_INFO) so that you can respond to any DMCA and copyright takedown notices if you accidentally rehost copyrighted content.
81+
Published archives automatically include a `robots.txt` `Dissallow: /` to block search engines from indexing them. You may still wish to publish your contact info in the index footer though using [`FOOTER_INFO`](https://github.com/ArchiveBox/ArchiveBox/wiki/Configuration#FOOTER_INFO) so that you can respond to any DMCA and copyright takedown notices if you accidentally rehost copyrighted content.

0 commit comments

Comments
 (0)