Merge branch 'master' into feature/images-as-docs

This commit is contained in:
Daniel Quinn 2016-02-09 17:20:45 +00:00
commit 4a078dcfbc
2 changed files with 2 additions and 1 deletions

View File

@ -5,6 +5,7 @@ sudo apt-get update
sudo apt-get build-dep -y python-imaging
sudo apt-get install -y libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev
sudo apt-get install -y build-essential python3-dev python3-pip sqlite3 libsqlite3-dev git
sudo apt-get install -y tesseract-ocr tesseract-ocr-eng imagemagick
# setup python project
pushd /opt/paperless

View File

@ -10,7 +10,7 @@ if __name__ == "__main__":
# The runserver and consumer need to have access to the passphrase, so it
# must be entered at start time to keep it safe.
if "runserver" in sys.argv or "consume" in sys.argv:
if "runserver" in sys.argv or "document_consumer" in sys.argv:
if not settings.PASSPHRASE:
settings.PASSPHRASE = input(
"settings.PASSPHRASE is unset. Input passphrase: ")