From 735db840225e2405f2a42642d0dc582f3dc81178 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 23 Apr 2019 22:36:43 -0400 Subject: [PATCH] add some missing defaults to Archivebox.conf.default --- archivebox/legacy/main.py | 2 +- etc/ArchiveBox.conf.default | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/archivebox/legacy/main.py b/archivebox/legacy/main.py index 20315231..a44248ec 100644 --- a/archivebox/legacy/main.py +++ b/archivebox/legacy/main.py @@ -76,7 +76,7 @@ def init(): ("{red}[X] This folder appears to have non-ArchiveBox files in it. You must run 'archivebox init' inside a completely empty directory.{reset}" "\n\n" " {lightred}Hint:{reset} To import a data folder created by an older version of ArchiveBox, \n" - " just cd into the folder and run 'archivebox update' to pick up where you left off.\n\n" + " just cd into the folder and run 'archivebox init' to pick up where you left off.\n\n" " (Always make sure your data folder is backed up first before updating ArchiveBox)" ).format(OUTPUT_DIR, **ANSI) ) diff --git a/etc/ArchiveBox.conf.default b/etc/ArchiveBox.conf.default index 8d646bfa..3e876b59 100644 --- a/etc/ArchiveBox.conf.default +++ b/etc/ArchiveBox.conf.default @@ -40,14 +40,16 @@ #CHECK_SSL_VALIDITY=True #FETCH_WGET_REQUISITES=True #RESOLUTION="1440,900" -#WGET_USER_AGENT="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.75 Safari/537.36" -#CHROME_USER_AGENT="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.75 Safari/537.36" #GIT_DOMAINS="github.com,bitbucket.org,gitlab.com" -#COOKIES_FILE="path/to/cookies.txt" -#CHROME_USER_DATA_DIR="~/.config/google-chrome/Default" + #CROME_HEADLESS=True #CROME_SANDBOX=True +#COOKIES_FILE="path/to/cookies.txt" +#CHROME_USER_DATA_DIR="~/.config/google-chrome/Default" + +#WGET_USER_AGENT="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.75 Safari/537.36" +#CHROME_USER_AGENT="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.75 Safari/537.36" ################################################################################ ## Shell Options