Merge branch 'dev' into consumer_status

.dockerignore

@@ -1,4 +1,3 @@
-**/__pycache__
 /src-ui/.vscode
 /src-ui/node_modules
 /src-ui/dist
@@ -11,9 +10,3 @@
 .pytest_cache
 /dist
 /scripts
-/resources
-**/tests
-**/*.spec.ts
-**/htmlcov
-/src/.pytest_cache
-.idea

.env

@@ -1 +1 @@
-COMPOSE_PROJECT_NAME=paperless
+COMPOSE_PROJECT_NAME=paperless

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,48 +0,0 @@
----
-name: Bug report
-about: Something is not working
-title: "[BUG] Concise description of the issue"
-labels: ''
-assignees: ''
-
----
-
-<!---
-=> Before opening an issue, please check the documentation and see if it helps you resolve your issue: https://paperless-ng.readthedocs.io/en/latest/troubleshooting.html
-=> Please also make sure that you followed the installation instructions.
-=> Please search the issues and look for similar issues before opening a bug report.
-
-=> If you would like to submit a feature request please submit one under https://github.com/jonaswinkler/paperless-ng/discussions/categories/feature-requests
-
-=> If you encounter issues while installing of configuring Paperless-ng, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably an issue with your system, and not an issue of paperless.
-
-=> Don't remove the [BUG] prefix from the title.
--->
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Webserver logs**
-```
-If available, post any logs from the web server related to your issue.
-```
-
-**Relevant information**
- - Host OS of the machine running paperless: [e.g. Archlinux / Ubuntu 20.04]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 1.0.0]
- - Installation method: [docker / bare metal]
- - Any configuration changes you made in `docker-compose.yml`, `docker-compose.env` or `paperless.conf`.

.github/ISSUE_TEMPLATE/other.md

@@ -1,20 +0,0 @@
----
-name: Other
-about: Anything that is not a feature request or bug.
-title: "[Other] Title of your issue"
-labels: ''
-assignees: ''
-
----
-
-<!--
-
-=> Discussions, Feedback and other suggestions belong in the "Discussion" section and not on the issue tracker.
-
-=> If you would like to submit a feature request please submit one under https://github.com/jonaswinkler/paperless-ng/discussions/categories/feature-requests
-
-=> If you encounter issues while installing of configuring Paperless-ng, please post that in the "Support" section of the discussions. Remember that Paperless successfully runs on a variety of different systems. If paperless does not start, it's probably is an issue with your system, and not an issue of paperless.
-
-=> Don't remove the [Other] prefix from the title.
-
--->

.github/workflow-scripts/check-trailing-newline

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# Verify that all text files end in a trailing newline.
-
-# Exit on first failing command.
-set -e
-
-# Exit on unset variable.
-set -u
-
-success=0
-
-function is_plaintext_file() {
-  local file="$1"
-  if [[ $file == *.svg ]]; then
-    echo ""
-    return
-  fi
-  file --brief "${file}" | grep text
-}
-
-# Split strings on newlines.
-IFS='
-'
-for file in $(git ls-files)
-do
-  if [[ -z $(is_plaintext_file "${file}") ]]; then
-    continue
-  fi
-
-  if ! [[ -z "$(tail -c 1 "${file}")" ]]; then
-    printf "File must end in a trailing newline: %s\n" "${file}" >&2
-    success=255
-  fi
-done
-
-exit "${success}"

.github/workflow-scripts/check-trailing-whitespace

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# Check for trailing whitespace at end of lines.
-
-# Exit on first failing command.
-set -e
-# Exit on unset variable.
-set -u
-
-FOUND_TRAILING_WHITESPACE=0
-
-while read -r line; do
-  if grep \
-    "\s$" \
-    --line-number \
-    --with-filename \
-    --binary-files=without-match \
-    --exclude="*.svg" \
-    --exclude="*.eps" \
-    "${line}"; then
-    echo "ERROR: Found trailing whitespace" >&2;
-    FOUND_TRAILING_WHITESPACE=1
-  fi
-done < <(git ls-files)
-
-exit "${FOUND_TRAILING_WHITESPACE}"

.github/workflows/ansible.yml

@@ -1,78 +0,0 @@
----
-name: Ansible Role
-
-on:
-  push:
-    branches-ignore:
-      - 'translations**'
-  pull_request:
-    branches-ignore:
-      - 'translations**'
-
-jobs:
-  # https://molecule.readthedocs.io/en/latest/ci.html#github-actions
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the codebase
-        uses: actions/checkout@v2
-        if: github.event_name != 'pull_request'
-        with:
-          path: "${{ github.repository }}"
-      - name: Check out the codebase
-        uses: actions/checkout@v2
-        if: github.event_name == 'pull_request'
-        with:
-          # merge commit is not available from tree at this point in time
-          # https://github.com/actions/checkout#checkout-pull-request-head-commit-instead-of-merge-commit
-          ref: "${{ github.event.pull_request.head.sha }}"
-          path: "${{ github.repository }}"
-      - name: Set up Python
-        uses: actions/setup-python@v2
-      - name: Set up Docker
-        uses: docker-practice/actions-setup-docker@master
-      - name: Install dependencies
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install molecule[ansible,docker] jmespath
-          ansible --version
-          docker --version
-          molecule --version
-          python --version
-      - name: Test installation/build/upgrade with molecule
-        run: |
-          cd ansible
-          molecule create
-          molecule verify
-          molecule converge
-          molecule idempotence
-          molecule verify
-        working-directory: "${{ github.repository }}"
-        env:
-          TARGET_GITHUB_SHA: "${{ github.event.pull_request.head.sha }}"
-  # # https://galaxy.ansible.com/docs/contributing/importing.html
-  # release:
-  #   runs-on: ubuntu-latest
-  #   needs:
-  #     - test
-  #   # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context
-  #   if: contains(github.ref, 'refs/tags/')
-  #   steps:
-  #     - name: Check out the codebase
-  #       uses: actions/checkout@v2
-  #       with:
-  #         path: "${{ github.repository }}"
-  #     - name: Set up Python
-  #       uses: actions/setup-python@v2
-  #     - name: Install dependencies
-  #       run: |
-  #         python3 -m pip install --upgrade ansible-base
-  #         ansible --version
-  #         python --version
-  #     - name: Trigger a new import on Galaxy
-  #     # TODO Check if source if pulled from cwd or imported from github
-  #     # https://github.com/ansible/ansible/blob/devel/lib/ansible/cli/galaxy.py
-  #       run: |
-  #         cd ansible
-  #         ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2)
-  #       working-directory: "${{ github.repository }}"

.github/workflows/ci.yml

@@ -1,346 +0,0 @@
-name: ci
-
-on:
-  push:
-    tags: ng-*
-    branches-ignore:
-      - 'translations**'
-  pull_request:
-    branches-ignore:
-      - 'translations**'
-
-jobs:
-  documentation:
-    runs-on: ubuntu-20.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-      -
-        name: Get pip cache dir
-        id: pip-cache
-        run: |
-          echo "::set-output name=dir::$(pip cache dir)"
-      -
-        name: Persistent Github pip cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip3.8}
-      -
-        name: Install dependencies
-        run: |
-          pip install --upgrade pipenv
-          pipenv install --system --dev --ignore-pipfile
-      -
-        name: Make documentation
-        run: |
-          cd docs/
-          make html
-      -
-        name: Upload artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: documentation
-          path: docs/_build/html/
-
-  codestyle:
-    runs-on: ubuntu-20.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-      -
-        name: Get pip cache dir
-        id: pip-cache
-        run: |
-          echo "::set-output name=dir::$(pip cache dir)"
-      -
-        name: Persistent Github pip cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip${{ matrix.python-version }}
-      -
-        name: Install dependencies
-        run: |
-          pip install --upgrade pipenv
-          pipenv install --system --dev --ignore-pipfile
-      -
-        name: Codestyle
-        run: |
-          cd src/
-          pycodestyle
-  whitespace:
-    runs-on: ubuntu-20.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Ensure there are no trailing spaces
-        run: |
-          .github/workflow-scripts/check-trailing-whitespace
-      -
-        name: Ensure all text files end with a trailing newline
-        run: |
-          .github/workflow-scripts/check-trailing-whitespace
-
-  tests:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        python-version: ['3.7', '3.8', '3.9']
-      fail-fast: false
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: "${{ matrix.python-version }}"
-      -
-        name: Get pip cache dir
-        id: pip-cache
-        run: |
-          echo "::set-output name=dir::$(pip cache dir)"
-      -
-        name: Persistent Github pip cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip${{ matrix.python-version }}
-      -
-        name: Install dependencies
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -qq --no-install-recommends unpaper tesseract-ocr imagemagick ghostscript optipng
-          pip install --upgrade pipenv
-          pipenv install --system --dev --ignore-pipfile
-      -
-        name: Tests
-        run: |
-          cd src/
-          pytest
-      -
-        name: Publish coverage results
-        if: matrix.python-version == '3.9'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        # https://github.com/coveralls-clients/coveralls-python/issues/251
-        run: |
-          cd src/
-          coveralls --service=github
-
-  frontend:
-    runs-on: ubuntu-20.04
-    steps:
-    -
-      name: Checkout
-      uses: actions/checkout@v2
-    -
-      uses: actions/setup-node@v2
-      with:
-        node-version: '15'
-    -
-      name: Configure version on dev branches
-      if: startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev'
-      run: |
-        git_hash=$(git rev-parse --short "$GITHUB_SHA")
-        git_branch=${GITHUB_REF#refs/heads/}
-        sed -i -E "s/version: \"(.*)\"/version: \"${git_branch} ${git_hash}\"/g" src-ui/src/environments/environment.prod.ts
-    -
-      name: Build frontend
-      run: ./compile-frontend.sh
-    -
-      name: Upload artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: frontend-compiled
-        path: src/documents/static/frontend/
-
-  build-release:
-    needs: [frontend, documentation, tests, whitespace, codestyle]
-    runs-on: ubuntu-20.04
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-      -
-        name: Install dependencies
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -qq --no-install-recommends gettext liblept5
-          pip3 install -r requirements.txt
-      -
-        name: Download frontend artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: frontend-compiled
-          path: src/documents/static/frontend/
-      -
-        name: Download documentation artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: documentation
-          path: docs/_build/html/
-      -
-        name: Move files
-        run: |
-          mkdir dist
-          mkdir dist/paperless-ng
-          mkdir dist/paperless-ng/scripts
-          cp .dockerignore .env Dockerfile Pipfile Pipfile.lock LICENSE README.md requirements.txt dist/paperless-ng/
-          cp paperless.conf.example dist/paperless-ng/paperless.conf
-          cp gunicorn.conf.py dist/paperless-ng/gunicorn.conf.py
-          cp docker/ dist/paperless-ng/docker -r
-          cp scripts/*.service scripts/*.sh dist/paperless-ng/scripts/
-          cp src/ dist/paperless-ng/src -r
-          cp docs/_build/html/ dist/paperless-ng/docs -r
-      -
-        name: Compile messages
-        run: |
-          cd dist/paperless-ng/src
-          python3 manage.py compilemessages
-      -
-        name: Collect static files
-        run: |
-          cd dist/paperless-ng/src
-          python3 manage.py collectstatic --no-input
-      -
-        name: Make release package
-        run: |
-          cd dist
-          find . -name __pycache__ | xargs rm -r
-          tar -cJf paperless-ng.tar.xz paperless-ng/
-      -
-        name: Upload release artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: release
-          path: dist/paperless-ng.tar.xz
-
-  publish-release:
-    runs-on: ubuntu-latest
-    needs: build-release
-    if: contains(github.ref, 'refs/tags/ng-')
-    steps:
-      -
-        name: Download release artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: release
-          path: ./
-      -
-        name: Get version
-        id: get_version
-        run: |
-          echo ::set-output name=version::${GITHUB_REF#refs/tags/ng-}
-      -
-        name: Create release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ng-${{ steps.get_version.outputs.version }}
-          release_name: Paperless-ng ${{ steps.get_version.outputs.version }}
-          draft: false
-          prerelease: false
-          body: |
-            For a complete list of changes, see the changelog at https://paperless-ng.readthedocs.io/en/latest/changelog.html.
-      -
-        name: Upload release archive
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ./paperless-ng.tar.xz
-          asset_name: paperless-ng-${{ steps.get_version.outputs.version }}.tar.xz
-          asset_content_type: application/x-xz
-
-  # build and push image to docker hub.
-  build-docker-image:
-    if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/ng-'))
-    runs-on: ubuntu-latest
-    needs: [frontend, tests, whitespace, codestyle]
-    steps:
-      -
-        name: Prepare
-        id: prepare
-        run: |
-          IMAGE_NAME=jonaswinkler/paperless-ng
-          if [[ $GITHUB_REF == refs/tags/ng-* ]]; then
-            TAGS=${IMAGE_NAME}:${GITHUB_REF#refs/tags/ng-},${IMAGE_NAME}:latest
-            INSPECT_TAG=${IMAGE_NAME}:latest
-          elif [[ $GITHUB_REF == refs/heads/* ]]; then
-            TAGS=${IMAGE_NAME}:${GITHUB_REF#refs/heads/}
-            INSPECT_TAG=${TAGS}
-          else
-            exit 1
-          fi
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=inspect_tag::${INSPECT_TAG}
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Download frontend artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: frontend-compiled
-          path: src/documents/static/frontend/
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      -
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          push: true
-          tags: ${{ steps.prepare.outputs.tags }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-      -
-        name: Inspect image
-        run: |
-          docker buildx imagetools inspect ${{ steps.prepare.outputs.inspect_tag }}

.gitignore

@@ -65,8 +65,8 @@ target/
 .virtualenv
 virtualenv
 /venv
-/docker-compose.env
-/docker-compose.yml
+docker-compose.env
+docker-compose.yml
 
 # Used for development
 scripts/import-for-development
@@ -76,13 +76,17 @@ scripts/nuke
 /static/
 
 # Stored PDFs
-/media/
-/data/
+/media/documents/originals/*
+/media/documents/thumbnails/*
+
+/data/classification_model.pickle
+/data/db.sqlite3
+/data/index
+
 /paperless.conf
-/consume/
-/export/
+/consume
+/export
 /src-ui/.vscode
 
 # this is where the compiled frontend is moved to.
 /src/documents/static/frontend/
-/docs/.vscode/settings.json

.readthedocs.yml

@@ -1,16 +0,0 @@
-# .readthedocs.yml
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Build documentation in the docs/ directory with Sphinx
-sphinx:
-  configuration: docs/conf.py
-
-# Optionally set the version of Python and requirements required to build your docs
-python:
-  version: 3.7
-  install:
-    - requirements: docs/requirements.txt

.travis.yml

@@ -0,0 +1,48 @@
+language: python
+
+jobs:
+  include:
+    - name: "Paperless on Python 3.6"
+      python: "3.6"
+
+    - name: "Paperless on Python 3.7"
+      python: "3.7"
+
+    - name: "Paperless on Python 3.8"
+      python: "3.8"
+
+    - name: "Documentation"
+      script:
+        - cd docs/
+        - make html
+      after_success: true
+
+    - name: "Front end"
+      language: node_js
+      node_js:
+        - 15
+      before_install: true
+      install:
+        - cd src-ui/
+        - npm install -g @angular/cli
+        - npm install
+      script:
+        - ng build --prod
+      after_success: true
+
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq libpoppler-cpp-dev unpaper tesseract-ocr imagemagick ghostscript
+
+install:
+  - pip install --upgrade pipenv
+  - pipenv install --system --dev
+
+script:
+  - cd src/
+  - pipenv run pytest --cov
+  - pipenv run pycodestyle
+
+after_success:
+  - pipenv run coveralls

CONTRIBUTING.md

@@ -1,30 +1,13 @@
 # Contributing
 
-There's still lots of things to be done, just have a look at that issue log. If you feel like conctributing to the project, please do! Bug fixes and improvements to the front end (I just can't seem to get some of these CSS things right) are always welcome.
+If you feel that somethings is not working, please submit an issue. You can also ask questions on the issue tracker by tagging your question with the question tag.
 
-If you want to implement something big: Please start a discussion about that in the issues! Maybe I've already had something similar in mind and we can make it happen together. However, keep in mind that the general roadmap is to make the existing features stable and get them tested. See the roadmap in the readme.
+Pull requests are welcome, however, I will be a little bit more strict about what goes into the code and what does not. If you want to make a big change, please ask me about it first.
 
 * When making additions to the project, consider if the majority of users will benefit from your change. If not, you're probably better of forking the project.
 * Also consider if your change will get in the way of other users. A good change is a change that enhances the experience of some users who want that change and does not affect users who do not care about the change.
 
-## Python
+However:
 
-Paperless supports python 3.6, 3.7, 3.8 and 3.9.
-
-## Branches
-
-master always reflects the latest release. Apart from changes to the documentation or readme, absolutely no functional changes on this branch in between releases.
-
-dev contains all changes that will be part of the next release. Use this branch to start making your changes.
-
-feature-X branches is for experimental stuff that will eventually be merged into dev, and then released as part of the next release.
-
-## Testing:
-
-I'm trying to get most of paperless tested, so please do the same for your code! I know its a hassle, but it makes sure that your code works now and will allow us to detect regressions easily.
-
-To test your code, execute `pytest` in the src/ directory. Executing that in the project root is no good. This also generates a html coverage report, which you can use to see if you missed anything important during testing.
-
-## More info:
-
-... is available in the documentation. https://paperless-ng.readthedocs.io/en/latest/extending.html
+* Bug fixes and are always welcome. Docker makes things easier, however, I alone cannot ensure that this runs on all platforms.
+* Improvements to the styling of the front-end are always welcome. I'm no expert in things UX, and simply copied one of the Bootstrap examples. I think it turned out rather good, but I just can't seem to get some things working properly.

Dockerfile

@@ -1,104 +0,0 @@
-FROM ubuntu:20.04 AS jbig2enc
-
-WORKDIR /usr/src/jbig2enc
-
-RUN apt-get update && apt-get install -y --no-install-recommends build-essential automake libtool libleptonica-dev zlib1g-dev git ca-certificates
-
-RUN git clone https://github.com/agl/jbig2enc .
-RUN ./autogen.sh
-RUN ./configure && make
-
-FROM python:3.9-slim-bullseye
-
-# Binary dependencies
-RUN apt-get update \
-	&& apt-get -y --no-install-recommends install \
-  	# Basic dependencies
-		curl \
-		gnupg \
-		imagemagick \
-		gettext \
-		tzdata \
-		gosu \
-		# fonts for text file thumbnail generation
-		fonts-liberation \
-		# for Numpy
-		libatlas-base-dev \
-		libxslt1-dev \
-		# thumbnail size reduction
-		optipng \
-		libxml2 \
-		pngquant \
-		unpaper \
-		zlib1g \
-		ghostscript \
-		icc-profiles-free \
-  	# Mime type detection
-		file \
-		libmagic-dev \
-		media-types \
-		# OCRmyPDF dependencies
-		liblept5 \
-		qpdf \
-		tesseract-ocr \
-		tesseract-ocr-eng \
-		tesseract-ocr-deu \
-		tesseract-ocr-fra \
-		tesseract-ocr-ita \
-		tesseract-ocr-spa \
-  && rm -rf /var/lib/apt/lists/*
-
-# copy jbig2enc
-COPY --from=jbig2enc /usr/src/jbig2enc/src/.libs/libjbig2enc* /usr/local/lib/
-COPY --from=jbig2enc /usr/src/jbig2enc/src/jbig2 /usr/local/bin/
-COPY --from=jbig2enc /usr/src/jbig2enc/src/*.h /usr/local/include/
-
-WORKDIR /usr/src/paperless/src/
-
-COPY requirements.txt ../
-
-# Python dependencies
-RUN apt-get update \
-  && apt-get -y --no-install-recommends install \
-		build-essential \
-		libpq-dev \
-		libqpdf-dev \
-	&& python3 -m pip install --upgrade --no-cache-dir supervisor \
-  && python3 -m pip install --no-cache-dir -r ../requirements.txt \
-	&& apt-get -y purge build-essential libqpdf-dev \
-	&& apt-get -y autoremove --purge \
-	&& rm -rf /var/lib/apt/lists/*
-
-# setup docker-specific things
-COPY docker/ ./docker/
-
-RUN cd docker \
-  && cp imagemagick-policy.xml /etc/ImageMagick-6/policy.xml \
-	&& mkdir /var/log/supervisord /var/run/supervisord \
-	&& cp supervisord.conf /etc/supervisord.conf \
-	&& cp docker-entrypoint.sh /sbin/docker-entrypoint.sh \
-	&& cp docker-prepare.sh /sbin/docker-prepare.sh \
-	&& chmod 755 /sbin/docker-entrypoint.sh \
-	&& chmod +x install_management_commands.sh \
-	&& ./install_management_commands.sh \
-	&& cd .. \
-	&& rm docker -rf
-
-COPY gunicorn.conf.py ../
-
-# copy app
-COPY src/ ./
-
-# add users, setup scripts
-RUN addgroup --gid 1000 paperless \
-	&& useradd --uid 1000 --gid paperless --home-dir /usr/src/paperless paperless \
-	&& chown -R paperless:paperless ../ \
-	&& gosu paperless python3 manage.py collectstatic --clear --no-input \
-	&& gosu paperless python3 manage.py compilemessages
-
-VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/usr/src/paperless/consume", "/usr/src/paperless/export"]
-ENTRYPOINT ["/sbin/docker-entrypoint.sh"]
-EXPOSE 8000
-CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"]
-
-LABEL maintainer="Jonas Winkler <dev@jpwinkler.de>"

Pipfile

@@ -9,48 +9,32 @@ verify_ssl = true
 name = "piwheels"
 
 [packages]
-dateparser = "~=1.0.0"
-django = "~=3.2"
+dateparser = "~=0.7.6"
+django = "~=3.1.3"
 django-cors-headers = "*"
 django-extensions = "*"
 django-filter = "~=2.4.0"
 django-q = "~=1.3.4"
 djangorestframework = "~=3.12.2"
-filelock = "*"
-fuzzywuzzy = {extras = ["speedup"], version = "*"}
+fuzzywuzzy = "*"
 gunicorn = "*"
 imap-tools = "*"
 langdetect = "*"
-numpy = "~=1.20.0"
+pdftotext = "*"
 pathvalidate = "*"
-pillow = "~=8.1"
-pikepdf = "~=2.5"
+pillow = "*"
+pyocr = "~=0.7.2"
 python-gnupg = "*"
 python-dotenv = "*"
 python-dateutil = "*"
+python-Levenshtein = "*"
 python-magic = "*"
 psycopg2-binary = "*"
 redis = "*"
-# Pinned because aarch64 wheels and updates cause warnings when loading the classifier model.
-scikit-learn="==0.24.0"
-whitenoise = "~=5.3.0"
-watchdog = "~=2.1.0"
+scikit-learn="~=0.23.2"
+whitenoise = "~=5.2.0"
+watchdog = "*"
 whoosh="~=2.7.4"
-inotifyrecursive = "~=0.3.4"
-ocrmypdf = "~=12.3"
-tqdm = "*"
-tika = "*"
-# TODO: This will sadly also install daphne+dependencies,
-#  which an ASGI server we don't need. Adds about 15MB image size.
-channels = "~=3.0"
-channels-redis = "*"
-uvicorn = {extras = ["standard"], version = "*"}
-concurrent-log-handler = "*"
-# uvloop 0.15+ incompatible with python 3.6
-uvloop = "~=0.15"
-cryptography = "~=3.4"
-"pdfminer.six" = "*"
-"backports.zoneinfo" = "*"
 
 [dev-packages]
 coveralls = "*"
@@ -62,6 +46,6 @@ pytest-django = "*"
 pytest-env = "*"
 pytest-sugar = "*"
 pytest-xdist = "*"
-sphinx = "~=3.4.2"
+sphinx = "~=3.3"
 sphinx_rtd_theme = "*"
 tox = "*"

README.md

@@ -1,116 +1,90 @@
-[![ci](https://github.com/jonaswinkler/paperless-ng/workflows/ci/badge.svg)](https://github.com/jonaswinkler/paperless-ng/actions)
-![Ansible Role](https://github.com/jonaswinkler/paperless-ng/workflows/Ansible%20Role/badge.svg)
-[![Crowdin](https://badges.crowdin.net/paperless-ng/localized.svg)](https://crowdin.com/project/paperless-ng)
+[![Build Status](https://travis-ci.org/jonaswinkler/paperless-ng.svg?branch=master)](https://travis-ci.org/jonaswinkler/paperless-ng)
 [![Documentation Status](https://readthedocs.org/projects/paperless-ng/badge/?version=latest)](https://paperless-ng.readthedocs.io/en/latest/?badge=latest)
-[![Gitter](https://badges.gitter.im/paperless-ng/community.svg)](https://gitter.im/paperless-ng/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Docker Hub Pulls](https://img.shields.io/docker/pulls/jonaswinkler/paperless-ng.svg)](https://hub.docker.com/r/jonaswinkler/paperless-ng)
 [![Coverage Status](https://coveralls.io/repos/github/jonaswinkler/paperless-ng/badge.svg?branch=master)](https://coveralls.io/github/jonaswinkler/paperless-ng?branch=master)
 
 # Paperless-ng
 
-[Paperless (click me)](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and contributors that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
+[Paperless](https://github.com/the-paperless-project/paperless) is an application by Daniel Quinn and others that indexes your scanned documents and allows you to easily search for documents and store metadata alongside your documents.
 
-Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. These key points should help you decide whether Paperless-ng is something you would prefer over Paperless:
+Paperless-ng is a fork of the original project, adding a new interface and many other changes under the hood. For a detailed list of changes, see below.
 
-* Interface: The new front end is the main interface for Paperless-ng, the old interface still exists but most customizations (such as thumbnails for the document list) have been removed.0
-* Encryption: Paperless-ng does not support GnuPG anymore, since storing your data on encrypted file systems (that you optionally mount on demand) achieves about the same result.
-* Resource usage: Paperless-ng does use a bit more resources than Paperless. Running the web server requires about 300MB of RAM or more, depending on the configuration. While adding documents, it requires about 300MB additional RAM, depending on the document. It still runs on Raspberry Pi (many users do that), but it has been generally geared to better use the resources of more powerful systems.
-* API changes: If you rely on the REST API of paperless, some of its functionality has been changed.
-
-For a detailed list of changes, have a look at the [change log](https://paperless-ng.readthedocs.io/en/latest/changelog.html) in the documentation, especially the section about the [0.9.0 release](https://paperless-ng.readthedocs.io/en/latest/changelog.html#paperless-ng-0-9-0).
+This project is still in development and some things may not work as expected.
 
 # How it Works
 
 Paperless does not control your scanner, it only helps you deal with what your scanner produces.
 
-1. Buy a document scanner that can write to a place on your network.  If you need some inspiration, have a look at the [scanner recommendations](https://paperless-ng.readthedocs.io/en/latest/scanners.html) page. Set it up to "scan to FTP" or something similar. It should be able to push scanned images to a server without you having to do anything.  Of course if your scanner doesn't know how to automatically upload the file somewhere, you can always do that manually. Paperless doesn't care how the documents get into its local consumption directory.
-
-	- Alternatively, you can use any of the mobile scanning apps out there. We have an app that allows you to share documents with paperless, if you're on Android. See the section on affiliated projects below.
-
-2. Wait for paperless to process your files. OCR is expensive, and depending on the power of your machine, this might take a bit of time.
-3. Use the web frontend to sift through the database and find what you want.
-4. Download the PDF you need/want via the web interface and do whatever you like with it.  You can even print it and send it as if it's the original. In most cases, no one will care or notice.
+1. Buy a document scanner that can write to a place on your network.  If you need some inspiration, have a look at the [scanner recommendations](https://paperless.readthedocs.io/en/latest/scanners.html) page.
+2. Set it up to "scan to FTP" or something similar. It should be able to push scanned images to a server without you having to do anything.  Of course if your scanner doesn't know how to automatically upload the file somewhere, you can always do that manually. Paperless doesn't care how the documents get into its local consumption directory.
+3. Have the target server run the Paperless consumption script to OCR the file and index it into a local database.
+4. Use the web frontend to sift through the database and find what you want.
+5. Download the PDF you need/want via the web interface and do whatever you like with it.  You can even print it and send it as if it's the original. In most cases, no one will care or notice.
 
 Here's what you get:
 
-![Dashboard](https://github.com/jonaswinkler/paperless-ng/raw/master/docs/_static/screenshots/dashboard.png)
+![The before and after](https://raw.githubusercontent.com/the-paperless-project/paperless/master/docs/_static/screenshot.png)
 
-If you want to see paperless-ng in action, [more screenshots are available in the documentation](https://paperless-ng.readthedocs.io/en/latest/screenshots.html).
+# Why Paperless-ng?
 
-# Features
+I wanted to make big changes to the project that will impact the way it is used by its users greatly. Among the users who currently use paperless in production there are probably many that don't want these changes right away. I also wanted to have more control over what goes into the code and what does not. Therefore, paperless-ng was created. NG stands for both Angular (the framework used for the Frontend) and next-gen. Publishing this project under a different name also avoids confusion between paperless and paperless-ng.
 
-* Performs OCR on your documents, adds selectable text to image only documents and adds tags, correspondents and document types to your documents.
-* Supports PDF documents, images, plain text files, and Office documents (Word, Excel, Powerpoint, and LibreOffice equivalents).
-	* Office document support is optional and provided by Apache Tika (see [configuration](https://paperless-ng.readthedocs.io/en/latest/configuration.html#tika-settings))
-* Paperless stores your documents plain on disk. Filenames and folders are managed by paperless and their format can be configured freely.
-* Single page application front end.
-	* Includes a dashboard that shows basic statistics and has document upload.
-	* Filtering by tags, correspondents, types, and more.
-	* Customizable views can be saved and displayed on the dashboard.
-* Full text search helps you find what you need.
-	* Auto completion suggests relevant words from your documents.
-	* Results are sorted by relevance to your search query.
-	* Highlighting shows you which parts of the document matched the query.
-	* Searching for similar documents ("More like this")
-* Email processing: Paperless adds documents from your email accounts.
-	* Configure multiple accounts and filters for each account.
-	* When adding documents from mail, paperless can move these mail to a new folder, mark them as read, flag them as important or delete them.
+The gist of the changes is the following:
+
+* New front end. This will eventually be mobile friendly as well.
+* New full text search.
 * Machine learning powered document matching.
-	* Paperless learns from your documents and will be able to automatically assign tags, correspondents and types to documents once you've stored a few documents in paperless.
-* Optimized for multi core systems: Paperless-ng consumes multiple documents in parallel.
-* The integrated sanity checker makes sure that your document archive is in good health.
+* Code cleanup in many, MANY areas.
+
+If you want to see some screenshots of paperless-ng in action, [some are available in the documentation](https://paperless-ng.readthedocs.io/en/latest/screenshots.html).
+
+For a complete list of changes, check out the [changelog](https://paperless-ng.readthedocs.io/en/latest/changelog.html)
+
+## Planned
+
+These features will make it into the application at some point, sorted by priority.
+
+- **More search.** The search backend is incredibly versatile and customizable. Searching is the most important feature of this project and thus, I want to implement things like:
+  - Group and limit search results by correspondent, show “more from this” links in the results.
+  - Ability to search for “Similar documents” in the search results
+  - Provide corrections for mispelled queries
+- **More robust consumer** that shows its progress on the web page.
+- **More rigid email processing**. Like, dont delete imported mail, provide filters, etc...
+- **Arbitrary tag colors**. Allow the selection of any color with a color picker.
+
+## On the chopping block.
+
+I don't know if these features are used all that much. I don't exactly know how they work and will probably remove them at some point in the future.
+
+- **GnuPG encrypion.** Since its disabled by default and the website allows transparent access to encrypted documents anyway, this doesn’t really provide any benefit over having the application stored on an encrypted file system.
 
 # Getting started
 
-The recommended way to deploy paperless is docker-compose. The files in the /docker/hub directory are configured to pull the image from Docker Hub.
+The recommended way to deploy paperless is docker-compose. Use the provided docker-compose.yml files to get started. This pulls the image from Docker hub. Alternatively, you can build the image yourself.
 
 Read the [documentation](https://paperless-ng.readthedocs.io/en/latest/setup.html#installation) on how to get started.
 
-Alternatively, you can install the dependencies and setup apache and a database server yourself. The documenation has a step by step guide on how to do it. Consider giving the Ansible role a shot, this essentially automates the entire bare metal installation process.
+Alternatively, you can install the dependencies and setup apache and a database server yourself. Details for that will be available in the documentation.
 
-# Migrating from Paperless to Paperless-ng
+# Migrating to paperless-ng
 
-Read the section about [migration](https://paperless-ng.readthedocs.io/en/latest/setup.html#migration-to-paperless-ng) in the documentation. Its also entirely possible to go back to Paperless by reverting the database migrations.
+Read the section about [migration](https://paperless-ng.readthedocs.io/en/latest/setup.html#migration-to-paperless-ng) in the documentation.
 
 # Documentation
 
 The documentation for Paperless-ng is available on [ReadTheDocs](https://paperless-ng.readthedocs.io/).
 
-# Translation
-
-Paperless is available in many different languages. Translation is coordinated at crowdin. If you want to help out by translating paperless into your language, please head over to https://github.com/jonaswinkler/paperless-ng/issues/212 for details!
-
-# Feature Requests
-
-Feature requests can be submitted via [GitHub Discussions](https://github.com/jonaswinkler/paperless-ng/discussions/categories/feature-requests), you can search for existing ideas, add your own and vote for the ones you care about! Note that some older feature requests can also be found under [issues](https://github.com/jonaswinkler/paperless-ng/issues).
-
-# Questions? Something not working?
-
-For bugs please [open an issue](https://github.com/jonaswinkler/paperless-ng/issues) or [start a discussion](https://github.com/jonaswinkler/paperless-ng/discussions) if you have questions.
-
-## Feel like helping out?
-
-There's still lots of things to be done, just have a look at open issues & discussions. If you feel like contributing to the project, please do! Bug fixes and improvements to the front end (I just can't seem to get some of these CSS things right) are always welcome. The documentation has some basic information on how to get started.
-
-If you want to implement something big: Please start a discussion about that! Maybe I've already had something similar in mind and we can make it happen together. However, keep in mind that the general roadmap is to make the existing features stable and get them tested.
-
 # Affiliated Projects
 
 Paperless has been around a while now, and people are starting to build stuff on top of it.  If you're one of those people, we can add your project to this list:
 
-* [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless. Updated to work with paperless-ng.
-* [Paperless Share](https://github.com/qcasey/paperless_share). Share any files from your Android application with paperless. Very simple, but works with all of the mobile scanning apps out there that allow you to share scanned documents.
-* [Scan to Paperless](https://github.com/sbrunner/scan-to-paperless): Scan and prepare (crop, deskew, OCR, ...) your documents for Paperless.
-
-These projects also exist, but their status and compatibility with paperless-ng is unknown.
-
+* [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless.
+* [Paperless Desktop](https://github.com/thomasbrueggemann/paperless-desktop): A desktop UI for your Paperless installation.  Runs on Mac, Linux, and Windows.
+* [ansible-role-paperless](https://github.com/ovv/ansible-role-paperless): An easy way to get Paperless running via Ansible.
 * [paperless-cli](https://github.com/stgarf/paperless-cli): A golang command line binary to interact with a Paperless instance.
 
-This project also exists, but needs updates to be compatile with paperless-ng.
-
-* [Paperless Desktop](https://github.com/thomasbrueggemann/paperless-desktop): A desktop UI for your Paperless installation.  Runs on Mac, Linux, and Windows.
-	Known issues on Mac: (Could not load reminders and documents)
+Compatibility with Paperless-ng is unknown.
 
 # Important Note
 
-Document scanners are typically used to scan sensitive documents.  Things like your social insurance number, tax records, invoices, etc.  Everything is stored in the clear without encryption. This means that Paperless should never be run on an untrusted host.  Instead, I recommend that if you do want to use it, run it locally on a server in your own home.
+Document scanners are typically used to scan sensitive documents.  Things like your social insurance number, tax records, invoices, etc.  Everything is stored in the clear without encryption by default (it needs to be searchable, so if someone has ideas on how to do that on encrypted data, I'm all ears).  This means that Paperless should never be run on an untrusted host.  Instead, I recommend that if you do want to use it, run it locally on a server in your own home.

ansible/README.md

@@ -1,116 +0,0 @@
-Ansible Role: paperless-ng
-==========================
-
-Installs and configures paperless-ng EDMS on Debian/Ubuntu systems.
-
-Requirements
-------------
-
-No special system requirements. Ansible 2.7 or newer is required.
-
-Note that this role requires root access, so either run it in a playbook with a global `become: yes`, or invoke the role in your playbook like:
-
-    - hosts: all
-      roles:
-        - role: paperless-ng
-          become: yes
-
-Role Variables
---------------
-
-Most configuration variables from paperless-ng itself are available and accept their respective arguments.
-Every `PAPERLESS_*` configuration variable is lowercased and instead prefixed with `paperlessng_*` in `defaults/main.yml`.
-
-For a full listing including explanations and allowed values, see the current [documentation](https://paperless-ng.readthedocs.io/en/latest/configuration.html).
-
-Additional variables available in this role are listed below, along with default values:
-
-    paperlessng_version: latest
-
-The [release](https://github.com/jonaswinkler/paperless-ng/releases) archive version of paperless-ng to install.
-`latest` stands for the latest release of paperless-ng.
-To install a specific version of paperless-ng, use the tag name of the release, e. g. `ng-1.4.4`, or specify a branch or commit id.
-
-    paperlessng_redis_host: localhost
-    paperlessng_redis_port: 6379
-
-Separate configuration values that combine into `PAPERLESS_REDIS`.
-
-    paperlessng_db_type: sqlite
-
-Database to use. Default is file-based SQLite.
-
-    paperlessng_db_host: localhost
-    paperlessng_db_port: 5432
-    paperlessng_db_name: paperlessng
-    paperlessng_db_user: paperlessng
-    paperlessng_db_pass: paperlessng
-    paperlessng_db_sslmode: prefer
-
-Database configuration (only applicable if `paperlessng_db_type == 'postgresql'`).
-
-    paperlessng_directory: /opt/paperless-ng
-
-Root directory paperless-ng is installed into.
-
-    paperlessng_virtualenv: "{{ paperlessng_directory }}/.venv"
-
-Directory used for the virtual environment for paperless-ng.
-
-    paperlessng_ocr_languages:
-      - eng
-
-List of OCR languages to install and configure (`apt search tesseract-ocr-*`).
-
-    paperlessng_use_jbig2enc: True
-
-Whether to install and use [jbig2enc](https://github.com/agl/jbig2enc) for OCRmyPDF.
-
-    paperlessng_big2enc_lossy: False
-
-Whether to use jbig2enc's lossy compression mode.
-
-    paperlessng_superuser_name: paperlessng
-    paperlessng_superuser_email: paperlessng@example.com
-    paperlessng_superuser_password: paperlessng
-
-Credentials of the initial superuser in paperless-ng.
-
-    paperlessng_system_user: paperlessng
-    paperlessng_system_group: paperlessng
-
-System user and group to run the paperless-ng services as (will be created if required).
-
-    paperlessng_listen_address: 127.0.0.1
-    paperlessng_listen_port: 8000
-
-Address and port for the paperless-ng service to listen on.
-
-Dependencies
-------------
-
-No ansible dependencies.
-
-Example Playbook
-----------------
-`playbook.yml`:
-
-    - hosts: all
-      become: yes
-      vars_files:
-        - vars/paperless-ng.yml
-      roles:
-        - paperless-ng
-
-`vars/paperless-ng.yml`:
-
-    paperlessng_media_root: /mnt/media/smbshare
-
-    paperlessng_db_type: postgresql
-    paperlessng_db_pass: PLEASEPROVIDEASTRONGPASSWORDHERE
-
-    paperlessng_secret_key: AGAINPLEASECHANGETHISNOW
-
-    paperlessng_ocr_languages:
-      - eng
-      - deu

ansible/defaults/main.yml

@@ -1,83 +0,0 @@
----
-paperlessng_version: latest  # 'latest', release number, or github branch/tag/commit/ref
-
-# Required services
-paperlessng_redis_host: localhost
-paperlessng_redis_port: 6379
-paperlessng_db_type: sqlite # or postgresql
-# Below entries only apply for paperlessng_db_type=='postgresql'
-paperlessng_db_host: localhost
-paperlessng_db_port: 5432
-paperlessng_db_name: paperlessng
-paperlessng_db_user: paperlessng
-paperlessng_db_pass: paperlessng
-paperlessng_db_sslmode: prefer
-
-# Paths and folders
-paperlessng_directory: /opt/paperless-ng
-paperlessng_consumption_dir: "{{ paperlessng_directory }}/consumption"
-paperlessng_data_dir: "{{ paperlessng_directory }}/data"
-paperlessng_media_root: "{{ paperlessng_directory }}/media"
-paperlessng_staticdir: "{{ paperlessng_directory }}/static"
-paperlessng_filename_format:
-paperlessng_logging_dir: "{{ paperlessng_data_dir }}/log"
-paperlessng_virtualenv: "{{ paperlessng_directory }}/.venv"
-
-# Hosting & Security
-paperlessng_secret_key: PLEASECHANGETHISFORTHELOVEOFGOD
-paperlessng_allowed_hosts: "*"
-paperlessng_cors_allowed_hosts: http://localhost:8000
-paperlessng_force_script_name:
-paperlessng_static_url: /static/
-paperlessng_auto_login_username:
-paperlessng_cookie_prefix: ""
-paperlessng_enable_http_remote_user: False
-
-# OCR settings
-paperlessng_ocr_languages:
-  - eng
-paperlessng_ocr_mode: skip
-paperlessng_ocr_clean: clean
-paperlessng_ocr_deskew: True
-paperlessng_ocr_rotate_pages: True
-paperlessng_ocr_rotate_pages_threshold: 12
-paperlessng_ocr_output_type: pdfa
-paperlessng_ocr_pages: 0
-paperlessng_ocr_image_dpi:
-# see https://ocrmypdf.readthedocs.io/en/latest/api.html#ocrmypdf.ocr
-paperlessng_ocr_user_args:
-  - "optimize": 1
-paperlessng_use_jbig2enc: True
-paperlessng_big2enc_lossy: False
-
-# Tika settings
-paperlessng_tika_enabled: False
-paperlessng_tika_endpoint: http://localhost:9998
-paperlessng_tika_gotenberg_endpoint: http://localhost:3000
-
-# Software tweaks
-paperlessng_time_zone: Europe/Berlin
-paperlessng_consumer_polling: 0
-paperlessng_consumer_delete_duplicates: False
-paperlessng_consumer_recursive: False
-paperlessng_consumer_subdirs_as_tags: False
-paperlessng_convert_memory_limit: 0
-paperlessng_convert_tmpdir:
-paperlessng_optimize_thumbnails: True
-paperlessng_post_consume_script:
-paperlessng_filename_date_order:
-paperlessng_thumbnail_font_name: /usr/share/fonts/liberation/LiberationSerif-Regular.ttf
-paperlessng_ignore_dates: ""
-
-# Superuser settings
-paperlessng_superuser_name: paperlessng
-paperlessng_superuser_email: paperlessng@example.com
-paperlessng_superuser_password: paperlessng
-
-# System user settings
-paperlessng_system_user: paperlessng
-paperlessng_system_group: paperlessng
-
-# Webserver settings
-paperlessng_listen_address: 127.0.0.1
-paperlessng_listen_port: 8000

ansible/meta/main.yml

@@ -1,17 +0,0 @@
-dependencies: []
-
-galaxy_info:
-  author: C0nsultant
-  description: Bare-metal deployment of paperless-ng DMS
-  license: license (GPLv3)
-  min_ansible_version: 2.7
-
-  platforms:
-    - name: Debian
-      versions:
-        - buster
-    - name: Ubuntu
-      versions:
-        - focal
-
-  galaxy_tags: [EDMS, django, python, web]

ansible/molecule/default/converge.yml

@@ -1,10 +0,0 @@
----
-- name: update previous release to newest release
-  hosts: all
-  tasks:
-    - name: set current github commit as version when available
-      set_fact:
-        paperlessng_version: "{{ lookup('env', 'TARGET_GITHUB_SHA') | default('master', True) }}"
-    - name: update to newest paperless-ng release
-      include_role:
-        name: ansible

ansible/molecule/default/molecule.yml

@@ -1,35 +0,0 @@
----
-dependency:
-  name: galaxy
-driver:
-  name: docker
-platforms:
-  - name: ubuntu_focal
-    image: jrei/systemd-ubuntu:20.04
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    tmpfs:
-      - /tmp
-      - /run
-      - /run/lock
-    override_command: False
-  # ubuntu 18.04 bionic works except that
-  #   the default redis configuration expects IPv6 which is not enabled in docker by default
-  #   the default Python environment is configured for ASCII instead of UTF-8
-  # ubuntu 16.04 xenial only has Python 3.5 which is EOL and breaks multiple dependencies
-  - name: debian_buster
-    image: jrei/systemd-debian:10
-    privileged: true
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    tmpfs:
-      - /tmp
-      - /run
-      - /run/lock
-    override_command: False
-  # debian 9 stretch only has Python 3.5 which is EOL and breaks multiple dependencies
-provisioner:
-  name: ansible
-verifier:
-  name: ansible

ansible/molecule/default/prepare.yml

@@ -1,10 +0,0 @@
-- name: install previous release
-  hosts: all
-  tasks:
-    - name: set previous version as installation target
-      set_fact:
-        paperlessng_version: latest
-
-    - name: install previous paperless-ng release
-      include_role:
-        name: ansible

ansible/molecule/default/verify.yml

@@ -1,94 +0,0 @@
----
-- name: Verify
-  hosts: all
-  gather_facts: false
-
-  vars_files:
-    - ../../defaults/main.yml
-
-  tasks:
-    - name: check if webserver is up
-      uri:
-        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}"
-        status_code: [200, 302]
-        return_content: yes
-      register: landingpage
-      failed_when: "'Sign in</button>' not in landingpage.content"
-
-    - name: generate random name and content
-      set_fact:
-        content: "{{ lookup('password', '/dev/null length=65536 chars=ascii_letters') }}"
-        filename: "{{ lookup('password', '/dev/null length=8 chars=ascii_letters') }}"
-
-    - name: check if document posting works
-      uri:
-        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/documents/post_document/"
-        method: POST
-        body_format: form-multipart
-        body:
-          document:
-            content: "{{ content }}"
-            filename: "{{ filename }}.txt"
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-          Content-Type: text/plain
-        return_content: yes
-      register: post_document
-      failed_when: "'OK' not in post_document.content"
-
-    - name: verify uploaded document has been accepted
-      uri:
-        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/paperless/"
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: logs
-      failed_when: "('Consuming ' + filename + '.txt') not in logs.content"
-
-    - name: sleep till consumption finished
-      pause:
-        seconds: 10
-
-    - name: verify uploaded document has been consumed
-      uri:
-        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/logs/paperless/"
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: logs
-      failed_when: "filename + ' consumption finished' not in logs.content"
-
-    - name: get documents
-      uri:
-        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/documents/"
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: documents
-
-    - name: set document index
-      set_fact:
-        index: "{{ documents.json['results'][0]['id'] }}"
-
-    - name: verify uploaded document is avaiable
-      uri:
-        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/documents/{{ index }}/"
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-        return_content: yes
-      register: document
-      failed_when: "'Not found.' in document.content or content not in document.json['content']"
-
-    - name: check if deleting uploaded document works
-      uri:
-        url: "http://{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}/api/documents/bulk_edit/"
-        method: POST
-        body_format: json
-        body:
-          documents: ["{{ index }}"]
-          method: delete
-          parameters: {}
-        headers:
-          Authorization: 'Basic {{ (paperlessng_superuser_name + ":" + paperlessng_superuser_password) | b64encode }}'
-      register: delete_document
-      failed_when: "'OK' not in delete_document.json['result']"

ansible/tasks/install-release.yml

@@ -1,6 +0,0 @@
----
-- name: extract paperless-ng
-  unarchive:
-    src: "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-{{ paperlessng_version }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
-    remote_src: yes
-    dest: "{{ tempdir.path }}"

ansible/tasks/install-source.yml

@@ -1,112 +0,0 @@
----
-- name: install dev dependencies
-  apt:
-    pkg:
-      - git
-      - npm
-      - gettext
-
-- name: create output directories
-  file:
-    path: "{{ item }}"
-    state: directory
-    owner: "{{ paperlessng_system_user }}"
-    group: "{{ paperlessng_system_group }}"
-    mode: "750"
-  with_items:
-    - "{{ tempdir.path }}/paperless-ng"
-    - "{{ tempdir.path }}/paperless-ng/scripts"
-
-- block:
-    - name: create temporary git directory
-      tempfile:
-        state: directory
-        path: "{{ paperlessng_directory }}"
-      register: gitdir
-
-    - name: pull paperless-ng
-      git:
-        repo: https://github.com/jonaswinkler/paperless-ng.git
-        dest: "{{ gitdir.path }}"
-        version: "{{ paperlessng_version }}"
-        refspec: "+refs/pull/*:refs/pull/*"
-
-    - name: compile frontend
-      command:
-        cmd: "{{ item }}"
-      args:
-        chdir: "{{ gitdir.path }}/src-ui"
-      failed_when: false
-      with_items:
-        - npm install -g @angular/cli
-        - npm install
-        - ./node_modules/.bin/ng build --prod
-
-    - name: copy application into place
-      copy:
-        src: "{{ gitdir.path }}/{{ item.src }}"
-        remote_src: yes
-        dest: "{{ tempdir.path }}/paperless-ng/{{ item.dest | default('') }}"
-      with_items:
-        - src: CONTRIBUTING.md
-        - src: LICENSE
-        - src: Pipfile
-        - src: Pipfile.lock
-        - src: README.md
-        - src: requirements.txt
-        - src: gunicorn.conf.py
-        - src: paperless.conf.example
-          dest: "paperless.conf"
-
-    - name: glob all scripts
-      find:
-        paths: ["{{ gitdir.path }}/scripts/"]
-        patterns:
-          - "*.service"
-          - "*.sh"
-      register: glob
-
-    - name: copy scripts
-      copy:
-        src: "{{ item.path }}"
-        remote_src: yes
-        dest: "{{ tempdir.path }}/paperless-ng/scripts/"
-      with_items:
-        - "{{ glob.files }}"
-
-    - name: copy sources
-      command:
-        cmd: "cp -r src/ {{ tempdir.path }}/paperless-ng/src"
-      args:
-        chdir: "{{ gitdir.path }}"
-
-    - name: create paperlessng venv
-      command:
-        cmd: "python3 -m virtualenv {{ gitdir.path }}/.venv/ -p /usr/bin/python3"
-
-    - name: install paperlessng requirements
-      command:
-        cmd: "{{ gitdir.path }}/.venv/bin/python3 -m pip install -r {{ gitdir.path }}/requirements.txt"
-
-    - name: compile messages
-      command: "{{ gitdir.path }}/.venv/bin/python3 manage.py compilemessages"
-      args:
-        chdir: "{{ tempdir.path }}/paperless-ng/src/"
-
-    - name: collect static files
-      command: "{{ gitdir.path }}/.venv/bin/python3 manage.py collectstatic --no-input"
-      args:
-        chdir: "{{ tempdir.path }}/paperless-ng/src/"
-
-    - name: remove pycache directories
-      shell: find . -name __pycache__ | xargs rm -r
-      args:
-        chdir: "{{ tempdir.path }}"
-
-    - name: remove temporary git directory
-      file:
-        path: "{{ gitdir.path }}"
-        state: absent
-
-  become: yes
-  become_user: "{{ paperlessng_system_user }}"

ansible/tasks/main.yml

@@ -1,553 +0,0 @@
----
-- name: verify operating system
-  fail:
-    msg: Sorry, only Debian and Ubuntu supported at the moment.
-  when: not(ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu')
-
-- name: install base dependencies
-  apt:
-    update_cache: yes
-    pkg:
-      # paperless-ng
-      - python3-pip
-      - python3-dev
-      - fonts-liberation
-      - imagemagick
-      - optipng
-      - gnupg
-      - libpq-dev
-      - libmagic-dev
-      - mime-support
-      # OCRmyPDF
-      - unpaper
-      - ghostscript
-      - icc-profiles-free
-      - qpdf
-      - liblept5
-      - libxml2
-      - pngquant
-      - zlib1g
-      - tesseract-ocr
-      # dev
-      - sudo
-      - build-essential
-      - python3-setuptools
-      - python3-wheel
-
-# upstream virtualenv in Ubuntu 20.04 is broken
-# https://github.com/pypa/virtualenv/issues/1873
-- name: install python virtualenv
-  pip:
-    name: virtualenv
-    extra_args: --upgrade
-
-- name: install ocr languages
-  apt:
-    pkg: "{{ paperlessng_ocr_languages | map('regex_replace', '^(.*)$', 'tesseract-ocr-\\1') | map('replace', '_', '-') | list }}"
-
-- name: set up notesalexp repository key (for jbig2enc)
-  apt_key:
-    url: https://notesalexp.org/debian/alexp_key.asc
-    state: present
-  when: paperlessng_use_jbig2enc
-
-- name: set up notesalexp repository (for jbig2enc)
-  apt_repository:
-    repo: "deb https://notesalexp.org/debian/{{ ansible_distribution_release }}/ {{ ansible_distribution_release }} main"
-    state: present
-  when: paperlessng_use_jbig2enc
-
-- name: set up notesalexp repository pinning
-  copy:
-    content: |
-      Package: *
-      Pin: release o=notesalexp.org
-      Pin-Priority: 1
-
-      Package: jbig2enc
-      Pin: release o=notesalexp.org
-      Pin-Priority: 500
-    dest: /etc/apt/preferences.d/notesalexp
-  when: paperlessng_use_jbig2enc
-
-- name: install jbig2enc
-  apt:
-    pkg: jbig2enc
-    update_cache: yes
-  when: paperlessng_use_jbig2enc
-
-- name: install redis
-  apt:
-    pkg: redis-server
-  when: paperlessng_redis_host == 'localhost' or paperlessng_redis_host == '127.0.0.1'
-
-- name: enable redis
-  systemd:
-    name: redis-server
-    enabled: yes
-    masked: no
-    state: started
-  when: paperlessng_redis_host == 'localhost' or paperlessng_redis_host == '127.0.0.1'
-
-- name: create paperless system group
-  group:
-    name: "{{ paperlessng_system_group }}"
-
-- name: create paperless system user
-  user:
-    name: "{{ paperlessng_system_user }}"
-    groups:
-      - "{{ paperlessng_system_group }}"
-    shell: /usr/sbin/nologin
-    # GNUPG_HOME required due to paperless db.py
-    create_home: yes
-
-- block:
-    - name: get latest release version
-      uri:
-        url: https://api.github.com/repos/jonaswinkler/paperless-ng/releases/latest
-        method: GET
-      register: latest_release
-    - name: parse latest release version
-      set_fact:
-        paperlessng_version: "{{ latest_release.json['tag_name'] }}"
-  when: paperlessng_version == "latest"
-
-- name: check if version is ref
-  fail:
-    msg: "Specifying `paperlessng_version` as git ref may not work as expected!"
-  ignore_errors: True  # Output failure (as warning), but don't consider play failed
-  when: paperlessng_version.startswith('refs/')
-
-- block:
-    - name: sanitize version string
-      set_fact:
-        paperlessng_version: "{{ paperlessng_version | regex_replace('^ng-(\\d+\\.\\d+\\.\\d+)$', '\\1') }}"
-    - name: get tag data
-      uri:
-        url: https://api.github.com/repos/jonaswinkler/paperless-ng/tags
-        method: GET
-      register: tags
-    - name: get commit for target tag
-      set_fact:
-        paperlessng_commit: "{{ tags.json | json_query('[?name==`ng-' + paperlessng_version +'`] | [0].commit.sha') }}"
-  when: paperlessng_version | regex_search("^(ng-)?(\d+\.\d+\.\d+)$")
-
-- block:
-    - name: check if version is branch
-      uri:
-        url: "https://api.github.com/repos/jonaswinkler/paperless-ng/branches/{{ paperlessng_version }}"
-        method: GET
-        status_code: [200, 404]
-      register: branch
-    - name: get commit for target branch
-      set_fact:
-        paperlessng_commit: "{{ branch.json | json_query('commit.sha') }}"
-      when: branch.status == 200
-    - block:
-        - name: check if version is commit-or-ref
-          uri:
-            url: "https://api.github.com/repos/jonaswinkler/paperless-ng/commits/{{ paperlessng_version }}"
-            method: GET
-            status_code: [200, 404, 422]
-          register: commit
-        - name: get commit for target commit-or-ref
-          set_fact:
-            paperlessng_commit: "{{ commit.json | json_query('sha') }}"
-          when: commit.status == 200
-        - name: fail
-          fail:
-            msg: "Can not determine commit from `paperlessng_version=={{ paperlessng_version }}`!"
-          when: commit.status != 200
-      when: branch.status == 404
-  when: not(paperlessng_version | regex_search("^(ng-)?(\d+\.\d+\.\d+)$"))
-
-- name: check for paperless-ng installation
-  command:
-    cmd: "cat {{ paperlessng_directory }}/.installed_version"
-  changed_when: '"No such file or directory" in paperlessng_current_commit.stderr or paperlessng_current_commit.stdout != paperlessng_commit | string'
-  failed_when: false
-  ignore_errors: yes
-  register: paperlessng_current_commit
-
-- name: register current state
-  set_fact:
-    fresh_installation: '{{ "No such file or directory" in paperlessng_current_commit.stderr }}'
-    update_installation: '{{ "No such file or directory" not in paperlessng_current_commit.stderr and paperlessng_current_commit.stdout != paperlessng_commit | string }}'
-    reconfigure_only: "{{ paperlessng_current_commit.stdout == paperlessng_commit | string }}"
-
-- block:
-    - name: backup current paperless-ng installation
-      copy:
-        src: "{{ paperlessng_directory }}"
-        remote_src: yes
-        dest: "{{ paperlessng_directory }}-{{ ansible_date_time.iso8601 }}/"
-    - name: remove current paperless sources
-      file:
-        path: "{{ paperlessng_directory }}/{{ item }}"
-        state: absent
-      with_items:
-        - docker
-        - docs
-        - scripts
-        - src
-        - static
-  when: update_installation
-
-- block:
-    - name: create paperless-ng directory and set permissions
-      file:
-        path: "{{ paperlessng_directory }}"
-        state: directory
-        owner: "{{ paperlessng_system_user }}"
-        group: "{{ paperlessng_system_group }}"
-        mode: "750"
-    - name: create temporary directory
-      become: yes
-      become_user: "{{ paperlessng_system_user }}"
-      tempfile:
-        state: directory
-        path: "{{ paperlessng_directory }}"
-      register: tempdir
-    - name: check if version is available as release archive
-      uri:
-        url: "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-{{ paperlessng_version }}/paperless-ng-{{ paperlessng_version }}.tar.xz"
-        method: GET
-        status_code: [200, 404]
-      register: release_archive
-    - name: install paperless-ng from source
-      include_tasks: install-source.yml
-      when: release_archive.status == 404
-    - name: install paperless-ng from release archive
-      include_tasks: install-release.yml
-      when: release_archive.status == 200
-    - name: change owner and permissions of paperless-ng
-      command:
-        cmd: "{{ item }}"
-        warn: false
-      with_items:
-        - "chown -R {{ paperlessng_system_user }}:{{ paperlessng_system_group }} {{ tempdir.path }}"
-        - "find {{ tempdir.path }} -type d -exec chmod 0750 {} ;"
-        - "find {{ tempdir.path }} -type f -exec chmod 0640 {} ;"
-    - name: move paperless-ng
-      command:
-        cmd: "cp -a {{ tempdir.path }}/paperless-ng/. {{ paperlessng_directory }}"
-    - name: store commit hash of installed version
-      copy:
-        content: "{{ paperlessng_commit }}"
-        dest: "{{ paperlessng_directory }}/.installed_version"
-        owner: "{{ paperlessng_system_user }}"
-        group: "{{ paperlessng_system_group }}"
-        mode: "0440"
-    - name: remove temporary directory
-      file:
-        path: "{{ tempdir.path }}"
-        state: absent
-  when: not reconfigure_only
-
-- name: create paperless-ng directories and set permissions
-  file:
-    path: "{{ item }}"
-    state: directory
-    owner: "{{ paperlessng_system_user }}"
-    group: "{{ paperlessng_system_group }}"
-    mode: "750"
-  with_items:
-    - "{{ paperlessng_consumption_dir }}"
-    - "{{ paperlessng_data_dir }}"
-    - "{{ paperlessng_media_root }}"
-    - "{{ paperlessng_staticdir }}"
-
-- name: rename initial config
-  command:
-    cmd: "mv -f {{ paperlessng_directory }}/paperless.conf {{ paperlessng_directory }}/paperless.conf.template"
-    removes: "{{ paperlessng_directory }}/paperless.conf"
-
-- name: configure paperless-ng
-  lineinfile:
-    path: "{{ paperlessng_directory }}/paperless.conf.template"
-    regexp: "^#?{{ item.regexp }}="
-    line: "{{ item.line }}"
-  with_items:
-    # Required services
-    - regexp: PAPERLESS_REDIS
-      line: "PAPERLESS_REDIS=redis://{{ paperlessng_redis_host }}:{{ paperlessng_redis_port }}"
-    # Paths and folders
-    - regexp: PAPERLESS_CONSUMPTION_DIR
-      line: "PAPERLESS_CONSUMPTION_DIR={{ paperlessng_consumption_dir }}"
-    - regexp: PAPERLESS_DATA_DIR
-      line: "PAPERLESS_DATA_DIR={{ paperlessng_data_dir }}"
-    - regexp: PAPERLESS_MEDIA_ROOT
-      line: "PAPERLESS_MEDIA_ROOT={{ paperlessng_media_root }}"
-    - regexp: PAPERLESS_STATICDIR
-      line: "PAPERLESS_STATICDIR={{ paperlessng_staticdir }}"
-    - regexp: PAPERLESS_FILENAME_FORMAT
-      line: "PAPERLESS_FILENAME_FORMAT={{ paperlessng_filename_format }}"
-    - regexp: PAPERLESS_LOGGING_DIR
-      line: "PAPERLESS_LOGGING_DIR={{ paperlessng_logging_dir }}"
-    # Hosting & Security
-    - regexp: PAPERLESS_SECRET_KEY
-      line: "PAPERLESS_SECRET_KEY={{ paperlessng_secret_key }}"
-    - regexp: PAPERLESS_ALLOWED_HOSTS
-      line: "PAPERLESS_ALLOWED_HOSTS={{ paperlessng_allowed_hosts }}"
-    - regexp: PAPERLESS_CORS_ALLOWED_HOSTS
-      line: "PAPERLESS_CORS_ALLOWED_HOSTS={{ paperlessng_cors_allowed_hosts }}"
-    - regexp: PAPERLESS_FORCE_SCRIPT_NAME
-      line: "PAPERLESS_FORCE_SCRIPT_NAME={{ paperlessng_force_script_name }}"
-    - regexp: PAPERLESS_STATIC_URL
-      line: "PAPERLESS_STATIC_URL={{ paperlessng_static_url }}"
-    - regexp: PAPERLESS_AUTO_LOGIN_USERNAME
-      line: "PAPERLESS_AUTO_LOGIN_USERNAME={{ paperlessng_auto_login_username }}"
-    - regexp: PAPERLESS_COOKIE_PREFIX
-      line: "PAPERLESS_COOKIE_PREFIX={{ paperlessng_cookie_prefix }}"
-    - regexp: PAPERLESS_ENABLE_HTTP_REMOTE_USER
-      line: "PAPERLESS_ENABLE_HTTP_REMOTE_USER={{ paperlessng_enable_http_remote_user }}"
-    # OCR settings
-    - regexp: PAPERLESS_OCR_LANGUAGE
-      line: "PAPERLESS_OCR_LANGUAGE={{ paperlessng_ocr_languages | join('+') | replace('-','_') }}"
-    - regexp: PAPERLESS_OCR_MODE
-      line: "PAPERLESS_OCR_MODE={{ paperlessng_ocr_mode }}"
-    - regexp: PAPERLESS_OCR_CLEAN
-      line: "PAPERLESS_OCR_CLEAN={{ paperlessng_ocr_clean }}"
-    - regexp: PAPERLESS_OCR_DESKEW
-      line: "PAPERLESS_OCR_DESKEW={{ paperlessng_ocr_deskew }}"
-    - regexp: PAPERLESS_OCR_ROTATE_PAGES
-      line: "PAPERLESS_OCR_ROTATE_PAGES={{ paperlessng_ocr_rotate_pages }}"
-    - regexp: PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD
-      line: "PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD={{ paperlessng_ocr_rotate_pages_threshold }}"
-    - regexp: PAPERLESS_OCR_OUTPUT_TYPE
-      line: "PAPERLESS_OCR_OUTPUT_TYPE={{ paperlessng_ocr_output_type }}"
-    - regexp: PAPERLESS_OCR_PAGES
-      line: "PAPERLESS_OCR_PAGES={{ paperlessng_ocr_pages }}"
-    - regexp: PAPERLESS_OCR_IMAGE_DPI
-      line: "PAPERLESS_OCR_IMAGE_DPI={{ paperlessng_ocr_image_dpi }}"
-    - regexp: PAPERLESS_OCR_USER_ARGS
-      line: "PAPERLESS_OCR_USER_ARGS={{ paperlessng_ocr_user_args | combine({'jbig2_lossy': true} if paperlessng_big2enc_lossy else {}) | to_json }}"
-    # Tika settings
-    - regexp: PAPERLESS_TIKA_ENABLED
-      line: "PAPERLESS_TIKA_ENABLED={{ paperlessng_tika_enabled }}"
-    - regexp: PAPERLESS_TIKA_ENDPOINT
-      line: "PAPERLESS_TIKA_ENDPOINT={{ paperlessng_tika_endpoint }}"
-    - regexp: PAPERLESS_TIKA_GOTENBERG_ENDPOINT
-      line: "PAPERLESS_TIKA_GOTENBERG_ENDPOINT={{ paperlessng_tika_endpoint }}"
-    # Software tweaks
-    - regexp: PAPERLESS_TIME_ZONE
-      line: "PAPERLESS_TIME_ZONE={{ paperlessng_time_zone }}"
-    - regexp: PAPERLESS_CONSUMER_POLLING
-      line: "PAPERLESS_CONSUMER_POLLING={{ paperlessng_consumer_polling }}"
-    - regexp: PAPERLESS_CONSUMER_DELETE_DUPLICATES
-      line: "PAPERLESS_CONSUMER_DELETE_DUPLICATES={{ paperlessng_consumer_delete_duplicates }}"
-    - regexp: PAPERLESS_CONSUMER_RECURSIVE
-      line: "PAPERLESS_CONSUMER_RECURSIVE={{ paperlessng_consumer_recursive }}"
-    - regexp: PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS
-      line: "PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS={{ paperlessng_consumer_subdirs_as_tags }}"
-    - regexp: PAPERLESS_CONVERT_MEMORY_LIMIT
-      line: "PAPERLESS_CONVERT_MEMORY_LIMIT={{ paperlessng_convert_memory_limit }}"
-    - regexp: PAPERLESS_CONVERT_TMPDIR
-      line: "PAPERLESS_CONVERT_TMPDIR={{ paperlessng_convert_tmpdir }}"
-    - regexp: PAPERLESS_OPTIMIZE_THUMBNAILS
-      line: "PAPERLESS_OPTIMIZE_THUMBNAILS={{ paperlessng_optimize_thumbnails }}"
-    - regexp: PAPERLESS_POST_CONSUME_SCRIPT
-      line: "PAPERLESS_POST_CONSUME_SCRIPT={{ paperlessng_post_consume_script }}"
-    - regexp: PAPERLESS_FILENAME_DATE_ORDER
-      line: "PAPERLESS_FILENAME_DATE_ORDER={{ paperlessng_filename_date_order }}"
-    - regexp: PAPERLESS_THUMBNAIL_FONT_NAME
-      line: "PAPERLESS_THUMBNAIL_FONT_NAME={{ paperlessng_thumbnail_font_name }}"
-    - regexp: PAPERLESS_IGNORE_DATES
-      line: "PAPERLESS_IGNORE_DATES={{ paperlessng_ignore_dates }}"
-  no_log: yes
-
-- name: configure paperless-ng database [sqlite]
-  lineinfile:
-    path: "{{ paperlessng_directory }}/paperless.conf.template"
-    regexp: "^#?PAPERLESS_DBHOST=(.*)$"
-    line: '#PAPERLESS_DBHOST=\1'
-    backrefs: yes
-  when: paperlessng_db_type == 'sqlite'
-
-- name: configure paperless-ng database [postgresql]
-  lineinfile:
-    path: "{{ paperlessng_directory }}/paperless.conf.template"
-    regexp: "^#?{{ item.regexp }}="
-    line: "{{ item.line }}"
-  with_items:
-    - regexp: PAPERLESS_DBHOST
-      line: "PAPERLESS_DBHOST={{ paperlessng_db_host }}"
-    - regexp: PAPERLESS_DBPORT
-      line: "PAPERLESS_DBPORT={{ paperlessng_db_port }}"
-    - regexp: PAPERLESS_DBNAME
-      line: "PAPERLESS_DBNAME={{ paperlessng_db_name }}"
-    - regexp: PAPERLESS_DBUSER
-      line: "PAPERLESS_DBUSER={{ paperlessng_db_user }}"
-    - regexp: PAPERLESS_DBPASS
-      line: "PAPERLESS_DBPASS={{ paperlessng_db_pass }}"
-    - regexp: PAPERLESS_DBSSLMODE
-      line: "PAPERLESS_DBSSLMODE={{ paperlessng_db_sslmode }}"
-  when: paperlessng_db_type == 'postgresql'
-  no_log: yes
-
-- name: deploy paperless-ng configuration
-  copy:
-    src: "{{ paperlessng_directory }}/paperless.conf.template"
-    remote_src: yes
-    dest: /etc/paperless.conf
-    owner: root
-    group: root
-    mode: "0644"
-  register: configuration
-
-- name: create paperlessng venv
-  become: yes
-  become_user: "{{ paperlessng_system_user }}"
-  command:
-    cmd: "python3 -m virtualenv {{ paperlessng_virtualenv }} -p /usr/bin/python3"
-    creates: "{{ paperlessng_virtualenv }}"
-  register: venv
-
-- block:
-    - name: install paperlessng requirements
-      become: yes
-      become_user: "{{ paperlessng_system_user }}"
-      pip:
-        requirements: "{{ paperlessng_directory }}/requirements.txt"
-        executable: "{{ paperlessng_virtualenv }}/bin/pip3"
-        extra_args: --upgrade
-    - name: migrate database schema
-      become: yes
-      become_user: "{{ paperlessng_system_user }}"
-      command: "{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py migrate"
-      register: database_schema
-      changed_when: '"No migrations to apply." not in database_schema.stdout'
-  when: not reconfigure_only
-
-- name: configure paperless superuser
-  become: yes
-  become_user: "{{ paperlessng_system_user }}"
-  # "manage.py createsuperuser" only works on interactive TTYs
-  vars:
-    creation_script: |
-      from django.contrib.auth.models import User
-      from django.contrib.auth.hashers import get_hasher
-
-      if User.objects.filter(username='{{ paperlessng_superuser_name }}').exists():
-          user = User.objects.get(username='{{ paperlessng_superuser_name }}')
-          old = user.__dict__.copy()
-
-          user.is_superuser = True
-          user.email = '{{ paperlessng_superuser_email }}'
-          user.set_password('{{ paperlessng_superuser_password }}')
-          user.save()
-          new = user.__dict__
-
-          algorithm, iterations, old_salt, old_hash = old['password'].split('$')
-          new_password_old_salt = get_hasher(algorithm).encode(password='{{ paperlessng_superuser_password }}', salt=old_salt, iterations=int(iterations))
-          _, _, _, new_hash = new_password_old_salt.split('$')
-          if not (old_hash == new_hash and old['is_superuser'] == new['is_superuser'] and old['email'] == new['email']):
-              print('changed')
-      else:
-          User.objects.create_superuser('{{ paperlessng_superuser_name }}', '{{ paperlessng_superuser_email }}', '{{ paperlessng_superuser_password }}')
-          print('changed')
-  command: '{{ paperlessng_virtualenv }}/bin/python3 {{ paperlessng_directory }}/src/manage.py shell -c "{{ creation_script }}"'
-  register: superuser
-  changed_when: superuser.stdout == 'changed'
-  no_log: yes
-
-- name: set ownership and permissions on paperlessng venv
-  file:
-    path: "{{ paperlessng_virtualenv }}"
-    state: directory
-    recurse: yes
-    owner: "{{ paperlessng_system_user }}"
-    group: "{{ paperlessng_system_group }}"
-    mode: g-w,o-rwx
-  when: venv.changed or not reconfigure_only
-
-- name: configure ghostscript for PDF
-  lineinfile:
-    path: /etc/ImageMagick-6/policy.xml
-    regexp: '(\s+)<policy domain="coder" rights=".*" pattern="PDF" />'
-    line: '\1<policy domain="coder" rights="read|write" pattern="PDF" />'
-    backrefs: yes
-
-- name: configure gunicorn web server
-  lineinfile:
-    path: "{{ paperlessng_directory }}/gunicorn.conf.py"
-    regexp: '^bind = '
-    line: "bind = '{{ paperlessng_listen_address }}:{{ paperlessng_listen_port }}'"
-
-- name: configure systemd services
-  ini_file:
-    path: "{{ paperlessng_directory }}/scripts/{{ item[0] }}"
-    section: "Service"
-    option: "{{ item[1].option  }}"
-    value: "{{ item[1].value }}"
-  with_nested:
-    - [
-        paperless-consumer.service,
-        paperless-scheduler.service,
-        paperless-webserver.service,
-      ]
-    - [
-        # https://www.freedesktop.org/software/systemd/man/systemd.exec.html
-        { option: "User", value: "{{ paperlessng_system_user }}" },
-        { option: "Group", value: "{{ paperlessng_system_group }}" },
-        { option: "WorkingDirectory", value: "{{ paperlessng_directory }}/src" },
-        { option: "ProtectSystem", value: "full" },
-        { option: "NoNewPrivileges", value: "true" },
-        { option: "PrivateUsers", value: "true" },
-        { option: "PrivateDevices", value: "true" },
-      ]
-
-- name: configure paperless-consumer service
-  ini_file:
-    path: "{{ paperlessng_directory }}/scripts/paperless-consumer.service"
-    section: "Service"
-    option: "ExecStart"
-    value: "{{ paperlessng_virtualenv }}/bin/python3 manage.py document_consumer"
-
-- name: configure paperless-scheduler service
-  ini_file:
-    path: "{{ paperlessng_directory }}/scripts/paperless-scheduler.service"
-    section: "Service"
-    option: "ExecStart"
-    value: "{{ paperlessng_virtualenv }}/bin/python3 manage.py qcluster"
-
-- name: configure paperless-webserver service
-  ini_file:
-    path: "{{ paperlessng_directory }}/scripts/paperless-webserver.service"
-    section: "Service"
-    option: "ExecStart"
-    value: "{{ paperlessng_virtualenv }}/bin/gunicorn -c {{ paperlessng_directory }}/gunicorn.conf.py paperless.asgi:application"
-
-- name: copy systemd services
-  copy:
-    src: "{{ paperlessng_directory }}/scripts/{{ item }}"
-    remote_src: yes
-    dest: "/etc/systemd/system/{{ item }}"
-  with_items:
-    - paperless-consumer.service
-    - paperless-scheduler.service
-    - paperless-webserver.service
-  register: paperless_services
-
-- name: reload systemd daemon
-  systemd:
-    name: "{{ item }}"
-    state: restarted
-    daemon_reload: yes
-  with_items:
-    - paperless-consumer
-    - paperless-scheduler
-    - paperless-webserver
-  when: paperless_services.changed or configuration.changed
-
-- name: enable paperlessng services
-  systemd:
-    name: "{{ item }}"
-    enabled: yes
-    masked: no
-    state: started
-  with_items:
-    - paperless-consumer
-    - paperless-scheduler
-    - paperless-webserver

compile-frontend.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd src-ui
-npm install
-./node_modules/.bin/ng build --prod

crowdin.yml

@@ -1,6 +0,0 @@
-commit_message: '[ci skip]'
-files:
-  - source: /src/locale/en_US/LC_MESSAGES/django.po
-    translation: /src/locale/%locale_with_underscore%/LC_MESSAGES/django.po
-  - source: /src-ui/messages.xlf
-    translation: /src-ui/src/locale/messages.%locale_with_underscore%.xlf

docker/compose/.env

@@ -1 +0,0 @@
-COMPOSE_PROJECT_NAME=paperless

docker/compose/docker-compose.portainer.yml

@@ -1,94 +0,0 @@
-# docker-compose file for running paperless from the Docker Hub.
-# This file contains everything paperless needs to run.
-# Paperless supports amd64, arm and arm64 hardware.
-#
-# All compose files of paperless configure paperless in the following way:
-#
-# - Paperless is (re)started on system boot, if it was running before shutdown.
-# - Docker volumes for storing data are managed by Docker.
-# - Folders for importing and exporting files are created in the same directory
-#   as this file and mounted to the correct folders inside the container.
-# - Paperless listens on port 8010.
-#
-# In addition to that, this docker-compose file adds the following optional
-# configurations:
-#
-# - Instead of SQLite (default), PostgreSQL is used as the database server.
-#
-# To install and update paperless with this file, do the following:
-#
-# - Open portainer Stacks list and click 'Add stack'
-# - Paste the contents of this file and assign a name, e.g. 'Paperless'
-# - Click 'Deploy the stack' and wait for it to be deployed
-# - Open the list of containers, select paperless_webserver_1
-# - Click 'Console' and then 'Connect' to open the command line inside the container
-# - Run 'python3 manage.py createsuperuser' to create a user
-# - Exit the console
-#
-# For more extensive installation and update instructions, refer to the
-# documentation.
-
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  db:
-    image: postgres:13
-    restart: unless-stopped
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    environment:
-      POSTGRES_DB: paperless
-      POSTGRES_USER: paperless
-      POSTGRES_PASSWORD: paperless
-
-  webserver:
-    image: jonaswinkler/paperless-ng:latest
-    restart: unless-stopped
-    depends_on:
-      - db
-      - broker
-    ports:
-      - 8010:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_DBHOST: db
-# The UID and GID of the user used to run paperless in the container. Set this
-# to your UID and GID on the host so that you have write access to the
-# consumption directory.
-      USERMAP_UID: 1000
-      USERMAP_GID: 100
-# Additional languages to install for text recognition, separated by a
-# whitespace. Note that this is
-# different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines the
-# language used for OCR.
-# The container installs English, German, Italian, Spanish and French by
-# default.
-# See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster
-# for available languages.
-      #PAPERLESS_OCR_LANGUAGES: tur ces
-# Adjust this key if you plan to make paperless available publicly. It should
-# be a very long sequence of random characters. You don't need to remember it.
-      #PAPERLESS_SECRET_KEY: change-me
-# Use this variable to set a timezone for the Paperless Docker containers. If not specified, defaults to UTC.
-      #PAPERLESS_TIME_ZONE: America/Los_Angeles
-# The default language to use for OCR. Set this to the language most of your
-# documents are written in.
-      #PAPERLESS_OCR_LANGUAGE: eng
-
-volumes:
-  data:
-  media:
-  pgdata:

docker/compose/docker-compose.postgres-tika.yml

@@ -1,90 +0,0 @@
-# docker-compose file for running paperless from the Docker Hub.
-# This file contains everything paperless needs to run.
-# Paperless supports amd64, arm and arm64 hardware.
-#
-# All compose files of paperless configure paperless in the following way:
-#
-# - Paperless is (re)started on system boot, if it was running before shutdown.
-# - Docker volumes for storing data are managed by Docker.
-# - Folders for importing and exporting files are created in the same directory
-#   as this file and mounted to the correct folders inside the container.
-# - Paperless listens on port 8000.
-#
-# In addition to that, this docker-compose file adds the following optional
-# configurations:
-#
-# - Instead of SQLite (default), PostgreSQL is used as the database server.
-# - Apache Tika and Gotenberg servers are started with paperless and paperless
-#   is configured to use these services. These provide support for consuming
-#   Office documents (Word, Excel, Power Point and their LibreOffice counter-
-#   parts.
-#
-# To install and update paperless with this file, do the following:
-#
-# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
-#   and '.env' into a folder.
-# - Run 'docker-compose pull'.
-# - Run 'docker-compose run --rm webserver createsuperuser' to create a user.
-# - Run 'docker-compose up -d'.
-#
-# For more extensive installation and update instructions, refer to the
-# documentation.
-
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  db:
-    image: postgres:13
-    restart: unless-stopped
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    environment:
-      POSTGRES_DB: paperless
-      POSTGRES_USER: paperless
-      POSTGRES_PASSWORD: paperless
-
-  webserver:
-    image: jonaswinkler/paperless-ng:latest
-    restart: unless-stopped
-    depends_on:
-      - db
-      - broker
-      - gotenberg
-      - tika
-    ports:
-      - 8000:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_DBHOST: db
-      PAPERLESS_TIKA_ENABLED: 1
-      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
-      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
-
-  gotenberg:
-    image: gotenberg/gotenberg:7
-    restart: unless-stopped
-    environment:
-      CHROMIUM_DISABLE_ROUTES: 1
-
-  tika:
-    image: apache/tika
-    restart: unless-stopped
-
-volumes:
-  data:
-  media:
-  pgdata:

docker/compose/docker-compose.postgres.yml

@@ -1,72 +0,0 @@
-# docker-compose file for running paperless from the Docker Hub.
-# This file contains everything paperless needs to run.
-# Paperless supports amd64, arm and arm64 hardware.
-#
-# All compose files of paperless configure paperless in the following way:
-#
-# - Paperless is (re)started on system boot, if it was running before shutdown.
-# - Docker volumes for storing data are managed by Docker.
-# - Folders for importing and exporting files are created in the same directory
-#   as this file and mounted to the correct folders inside the container.
-# - Paperless listens on port 8000.
-#
-# In addition to that, this docker-compose file adds the following optional
-# configurations:
-#
-# - Instead of SQLite (default), PostgreSQL is used as the database server.
-#
-# To install and update paperless with this file, do the following:
-#
-# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
-#   and '.env' into a folder.
-# - Run 'docker-compose pull'.
-# - Run 'docker-compose run --rm webserver createsuperuser' to create a user.
-# - Run 'docker-compose up -d'.
-#
-# For more extensive installation and update instructions, refer to the
-# documentation.
-
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  db:
-    image: postgres:13
-    restart: unless-stopped
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    environment:
-      POSTGRES_DB: paperless
-      POSTGRES_USER: paperless
-      POSTGRES_PASSWORD: paperless
-
-  webserver:
-    image: jonaswinkler/paperless-ng:latest
-    restart: unless-stopped
-    depends_on:
-      - db
-      - broker
-    ports:
-      - 8000:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_DBHOST: db
-
-
-volumes:
-  data:
-  media:
-  pgdata:

docker/compose/docker-compose.sqlite-tika.yml

@@ -1,78 +0,0 @@
-# docker-compose file for running paperless from the Docker Hub.
-# This file contains everything paperless needs to run.
-# Paperless supports amd64, arm and arm64 hardware.
-#
-# All compose files of paperless configure paperless in the following way:
-#
-# - Paperless is (re)started on system boot, if it was running before shutdown.
-# - Docker volumes for storing data are managed by Docker.
-# - Folders for importing and exporting files are created in the same directory
-#   as this file and mounted to the correct folders inside the container.
-# - Paperless listens on port 8000.
-#
-# SQLite is used as the database. The SQLite file is stored in the data volume.
-#
-# In addition to that, this docker-compose file adds the following optional
-# configurations:
-#
-# - Apache Tika and Gotenberg servers are started with paperless and paperless
-#   is configured to use these services. These provide support for consuming
-#   Office documents (Word, Excel, Power Point and their LibreOffice counter-
-#   parts.
-#
-# To install and update paperless with this file, do the following:
-#
-# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
-#   and '.env' into a folder.
-# - Run 'docker-compose pull'.
-# - Run 'docker-compose run --rm webserver createsuperuser' to create a user.
-# - Run 'docker-compose up -d'.
-#
-# For more extensive installation and update instructions, refer to the
-# documentation.
-
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  webserver:
-    image: jonaswinkler/paperless-ng:latest
-    restart: unless-stopped
-    depends_on:
-      - broker
-      - gotenberg
-      - tika
-    ports:
-      - 8000:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-      PAPERLESS_TIKA_ENABLED: 1
-      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
-      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
-
-  gotenberg:
-    image: gotenberg/gotenberg:7
-    restart: unless-stopped
-    environment:
-      CHROMIUM_DISABLE_ROUTES: 1
-
-  tika:
-    image: apache/tika
-    restart: unless-stopped
-
-volumes:
-  data:
-  media:

docker/compose/docker-compose.sqlite.yml

@@ -1,56 +0,0 @@
-# docker-compose file for running paperless from the Docker Hub.
-# This file contains everything paperless needs to run.
-# Paperless supports amd64, arm and arm64 hardware.
-#
-# All compose files of paperless configure paperless in the following way:
-#
-# - Paperless is (re)started on system boot, if it was running before shutdown.
-# - Docker volumes for storing data are managed by Docker.
-# - Folders for importing and exporting files are created in the same directory
-#   as this file and mounted to the correct folders inside the container.
-# - Paperless listens on port 8000.
-#
-# SQLite is used as the database. The SQLite file is stored in the data volume.
-#
-# To install and update paperless with this file, do the following:
-#
-# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
-#   and '.env' into a folder.
-# - Run 'docker-compose pull'.
-# - Run 'docker-compose run --rm webserver createsuperuser' to create a user.
-# - Run 'docker-compose up -d'.
-#
-# For more extensive installation and update instructions, refer to the
-# documentation.
-
-version: "3.4"
-services:
-  broker:
-    image: redis:6.0
-    restart: unless-stopped
-
-  webserver:
-    image: jonaswinkler/paperless-ng:latest
-    restart: unless-stopped
-    depends_on:
-      - broker
-    ports:
-      - 8000:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-    volumes:
-      - data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
-      - ./export:/usr/src/paperless/export
-      - ./consume:/usr/src/paperless/consume
-    env_file: docker-compose.env
-    environment:
-      PAPERLESS_REDIS: redis://broker:6379
-
-
-volumes:
-  data:
-  media:

docker/docker-compose.env

@@ -7,7 +7,7 @@
 # Additional languages to install for text recognition, separated by a
 # whitespace. Note that this is
 # different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines the
-# language used for OCR.
+# default language used when guessing the language from the OCR output.
 # The container installs English, German, Italian, Spanish and French by
 # default.
 # See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster
@@ -32,3 +32,8 @@
 # The default language to use for OCR. Set this to the language most of your
 # documents are written in.
 #PAPERLESS_OCR_LANGUAGE=eng
+
+# By default Paperless does not OCR a document if the text can be retrieved from
+# the document directly. Set to true to always OCR documents. (i.e., if you
+# know that some of your documents have faulty/bad OCR data)
+#PAPERLESS_OCR_ALWAYS=true

docker/docker-entrypoint.sh

@@ -4,42 +4,81 @@ set -e
 
 # Source: https://github.com/sameersbn/docker-gitlab/
 map_uidgid() {
-	USERMAP_ORIG_UID=$(id -u paperless)
-	USERMAP_ORIG_GID=$(id -g paperless)
-	USERMAP_NEW_UID=${USERMAP_UID:-$USERMAP_ORIG_UID}
-	USERMAP_NEW_GID=${USERMAP_GID:-${USERMAP_ORIG_GID:-$USERMAP_NEW_UID}}
-	if [[ ${USERMAP_NEW_UID} != "${USERMAP_ORIG_UID}" || ${USERMAP_NEW_GID} != "${USERMAP_ORIG_GID}" ]]; then
-		echo "Mapping UID and GID for paperless:paperless to $USERMAP_NEW_UID:$USERMAP_NEW_GID"
-		usermod -u "${USERMAP_NEW_UID}" paperless
-		groupmod -o -g "${USERMAP_NEW_GID}" paperless
+    USERMAP_ORIG_UID=$(id -u paperless)
+    USERMAP_ORIG_GID=$(id -g paperless)
+    USERMAP_NEW_UID=${USERMAP_UID:-$USERMAP_ORIG_UID}
+    USERMAP_NEW_GID=${USERMAP_GID:-${USERMAP_ORIG_GID:-$USERMAP_NEW_UID}}
+    if [[ ${USERMAP_NEW_UID} != "${USERMAP_ORIG_UID}" || ${USERMAP_NEW_GID} != "${USERMAP_ORIG_GID}" ]]; then
+        echo "Mapping UID and GID for paperless:paperless to $USERMAP_NEW_UID:$USERMAP_NEW_GID"
+        usermod -u "${USERMAP_NEW_UID}" paperless
+        groupmod -o -g "${USERMAP_NEW_GID}" paperless
+    fi
+}
+
+
+wait_for_postgres() {
+	attempt_num=1
+	max_attempts=5
+
+	echo "Waiting for PostgreSQL to start..."
+
+	host="${PAPERLESS_DBHOST}"
+
+	while !</dev/tcp/$host/5432 ;
+	do
+
+		if [ $attempt_num -eq $max_attempts ]
+		then
+			echo "Unable to connect to database."
+			exit 1
+		else
+			echo "Attempt $attempt_num failed! Trying again in 5 seconds..."
+
+		fi
+
+		attempt_num=$(expr "$attempt_num" + 1)
+		sleep 5
+	done
+
+
+}
+
+
+migrations() {
+
+	if [[ -n "${PAPERLESS_DBHOST}" ]]
+	then
+		wait_for_postgres
 	fi
+
+	(
+		# flock is in place to prevent multiple containers from doing migrations
+		# simultaneously. This also ensures that the db is ready when the command
+		# of the current container starts.
+		flock 200
+		sudo -HEu paperless python3 manage.py migrate
+	)  200>/usr/src/paperless/data/migration_lock
+
 }
 
 initialize() {
 	map_uidgid
 
 	for dir in export data data/index media media/documents media/documents/originals media/documents/thumbnails; do
-		if [[ ! -d "../$dir" ]]; then
-			echo "Creating directory ../$dir"
+		if [[ ! -d "../$dir" ]]
+		then
+			echo "creating directory ../$dir"
 			mkdir ../$dir
 		fi
 	done
 
-	echo "Creating directory /tmp/paperless"
-	mkdir -p /tmp/paperless
+	chown -R paperless:paperless ../
 
-	set +e
-	echo "Adjusting permissions of paperless files. This may take a while."
-	chown -R paperless:paperless /tmp/paperless
-	find .. -not \( -user paperless -and -group paperless \) -exec chown paperless:paperless {} +
-	set -e
+	migrations
 
-	gosu paperless /sbin/docker-prepare.sh
 }
 
 install_languages() {
-	echo "Installing languages..."
-
 	local langs="$1"
 	read -ra langs <<<"$langs"
 
@@ -50,43 +89,40 @@ install_languages() {
 	apt-get update
 
 	for lang in "${langs[@]}"; do
-		pkg="tesseract-ocr-$lang"
-		# English is installed by default
-		#if [[ "$lang" ==  "eng" ]]; then
-		#    continue
-		#fi
+        pkg="tesseract-ocr-$lang"
+        # English is installed by default
+        #if [[ "$lang" ==  "eng" ]]; then
+        #    continue
+        #fi
 
-		if dpkg -s $pkg &>/dev/null; then
-			echo "Package $pkg already installed!"
-			continue
-		fi
+        if dpkg -s $pkg &> /dev/null; then
+        	echo "package $pkg already installed!"
+        	continue
+        fi
 
-		if ! apt-cache show $pkg &>/dev/null; then
-			echo "Package $pkg not found! :("
-			continue
-		fi
+        if ! apt-cache show $pkg &> /dev/null; then
+        	echo "package $pkg not found! :("
+        	continue
+        fi
 
-		echo "Installing package $pkg..."
-		if ! apt-get -y install "$pkg" &>/dev/null; then
-			echo "Could not install $pkg"
-			exit 1
-		fi
-	done
+				echo "Installing package $pkg..."
+				if ! apt-get -y install "$pkg" &> /dev/null; then
+					echo "Could not install $pkg"
+					exit 1
+				fi
+    done
 }
 
-echo "Paperless-ng docker container starting..."
-
-# Install additional languages if specified
-if [[ ! -z "$PAPERLESS_OCR_LANGUAGES" ]]; then
-	install_languages "$PAPERLESS_OCR_LANGUAGES"
-fi
-
 initialize
 
+# Install additional languages if specified
+if [[ ! -z "$PAPERLESS_OCR_LANGUAGES"  ]]; then
+		install_languages "$PAPERLESS_OCR_LANGUAGES"
+fi
+
 if [[ "$1" != "/"* ]]; then
-	echo Executing management command "$@"
-	exec gosu paperless python3 manage.py "$@"
+	exec sudo -HEu paperless python3 manage.py "$@"
 else
-	echo Executing "$@"
 	exec "$@"
 fi
+

docker/docker-prepare.sh

@@ -1,72 +0,0 @@
-#!/usr/bin/env bash
-
-wait_for_postgres() {
-	attempt_num=1
-	max_attempts=5
-
-	echo "Waiting for PostgreSQL to start..."
-
-	host="${PAPERLESS_DBHOST}"
-	port="${PAPERLESS_DBPORT}"
-
-	if [[ -z $port ]]; then
-		port="5432"
-	fi
-
-	while ! </dev/tcp/$host/$port; do
-
-		if [ $attempt_num -eq $max_attempts ]; then
-			echo "Unable to connect to database."
-			exit 1
-		else
-			echo "Attempt $attempt_num failed! Trying again in 5 seconds..."
-
-		fi
-
-		attempt_num=$(expr "$attempt_num" + 1)
-		sleep 5
-	done
-}
-
-migrations() {
-	(
-		# flock is in place to prevent multiple containers from doing migrations
-		# simultaneously. This also ensures that the db is ready when the command
-		# of the current container starts.
-		flock 200
-		echo "Apply database migrations..."
-		python3 manage.py migrate
-	) 200>/usr/src/paperless/data/migration_lock
-}
-
-search_index() {
-	index_version=1
-	index_version_file=/usr/src/paperless/data/.index_version
-
-	if [[ (! -f "$index_version_file") || $(<$index_version_file) != "$index_version" ]]; then
-		echo "Search index out of date. Updating..."
-		python3 manage.py document_index reindex
-		echo $index_version | tee $index_version_file >/dev/null
-	fi
-}
-
-superuser() {
-	if [[ -n "${PAPERLESS_ADMIN_USER}" ]]; then
-		python3 manage.py manage_superuser
-	fi
-}
-
-do_work() {
-	if [[ -n "${PAPERLESS_DBHOST}" ]]; then
-		wait_for_postgres
-	fi
-
-	migrations
-
-	search_index
-
-	superuser
-
-}
-
-do_work

docker/gunicorn.conf.py

@@ -1,9 +1,21 @@
-import os
-
-bind = '0.0.0.0:8000'
-workers = int(os.getenv("PAPERLESS_WEBSERVER_WORKERS", 2))
-worker_class = 'paperless.workers.ConfigurableWorker'
-timeout = 120
+bind = '127.0.0.1:8000'
+backlog = 2048
+workers = 3
+worker_class = 'sync'
+worker_connections = 1000
+timeout = 20
+keepalive = 2
+spew = False
+daemon = False
+pidfile = None
+umask = 0
+user = None
+group = None
+tmp_upload_dir = None
+loglevel = 'info'
+errorlog = '-'
+accesslog = '-'
+proc_name = None
 
 def pre_fork(server, worker):
     pass

docker/hub/docker-compose.postgres.yml

@@ -0,0 +1,44 @@
+version: "3.4"
+services:
+  broker:
+    image: redis:6.0
+    restart: always
+
+  db:
+    image: postgres:13
+    restart: always
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: paperless
+      POSTGRES_USER: paperless
+      POSTGRES_PASSWORD: paperless
+
+  webserver:
+    image: jonaswinkler/paperless-ng:0.9.1
+    restart: always
+    depends_on:
+      - db
+      - broker
+    ports:
+      - 8000:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - data:/usr/src/paperless/data
+      - media:/usr/src/paperless/media
+      - ./export:/usr/src/paperless/export
+      - ./consume:/usr/src/paperless/consume
+    env_file: docker-compose.env
+    environment:
+      PAPERLESS_REDIS: redis://broker:6379
+      PAPERLESS_DBHOST: db
+
+
+volumes:
+  data:
+  media:
+  pgdata:

docker/hub/docker-compose.sqlite.yml

@@ -0,0 +1,31 @@
+version: "3.4"
+services:
+  broker:
+    image: redis:6.0
+    restart: always
+
+  webserver:
+    image: jonaswinkler/paperless-ng:0.9.1
+    restart: always
+    depends_on:
+      - broker
+    ports:
+      - 8000:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - data:/usr/src/paperless/data
+      - media:/usr/src/paperless/media
+      - ./export:/usr/src/paperless/export
+      - ./consume:/usr/src/paperless/consume
+    env_file: docker-compose.env
+    environment:
+      PAPERLESS_REDIS: redis://broker:6379
+
+
+volumes:
+  data:
+  media:

docker/install_management_commands.sh

@@ -1,6 +0,0 @@
-for command in document_archiver document_exporter document_importer mail_fetcher document_create_classifier document_index document_renamer document_retagger document_thumbnails document_sanity_checker manage_superuser;
-do
-	echo "installing $command..."
-	sed "s/management_command/$command/g" management_script.sh > /usr/local/bin/$command
-	chmod +x /usr/local/bin/$command
-done

docker/local/Dockerfile

@@ -0,0 +1,60 @@
+FROM python:3.7-slim
+
+WORKDIR /usr/src/paperless/
+
+COPY requirements.txt ./
+
+#Dependencies
+RUN apt-get update \
+  && apt-get -y --no-install-recommends install \
+		build-essential \
+		curl \
+		ghostscript \
+		gnupg \
+		imagemagick \
+		libatlas-base-dev \
+		libmagic-dev \
+		libpoppler-cpp-dev \
+		libpq-dev \
+		optipng \
+		sudo \
+		tesseract-ocr \
+		tesseract-ocr-eng \
+		tesseract-ocr-deu \
+		tesseract-ocr-fra \
+		tesseract-ocr-ita \
+		tesseract-ocr-spa \
+		tzdata \
+		unpaper \
+	&& pip3 install --upgrade supervisor setuptools \
+	&& pip install --no-cache-dir -r requirements.txt \
+	&& apt-get -y purge build-essential \
+	&& apt-get -y autoremove --purge \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& mkdir /var/log/supervisord /var/run/supervisord
+
+# copy scripts
+# this fixes issues with imagemagick and PDF
+COPY docker/imagemagick-policy.xml /etc/ImageMagick-6/policy.xml
+COPY docker/gunicorn.conf.py ./
+COPY docker/supervisord.conf /etc/supervisord.conf
+COPY docker/docker-entrypoint.sh /sbin/docker-entrypoint.sh
+
+# copy app
+COPY src/ ./src/
+
+# add users, setup scripts
+RUN addgroup --gid 1000 paperless \
+	&& useradd --uid 1000 --gid paperless --home-dir /usr/src/paperless paperless \
+	&& chown -R paperless:paperless . \
+	&& chmod 755 /sbin/docker-entrypoint.sh
+
+WORKDIR /usr/src/paperless/src/
+
+RUN sudo -HEu paperless python3 manage.py collectstatic --clear --no-input
+
+VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/usr/src/paperless/consume", "/usr/src/paperless/export"]
+ENTRYPOINT ["/sbin/docker-entrypoint.sh"]
+CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"]
+
+LABEL maintainer="Jonas Winkler <dev@jpwinkler.de>"

docker/local/docker-compose.postgres.yml

@@ -0,0 +1,44 @@
+version: "3.4"
+services:
+  broker:
+    image: redis:6.0
+    restart: always
+
+  db:
+    image: postgres:13
+    restart: always
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: paperless
+      POSTGRES_USER: paperless
+      POSTGRES_PASSWORD: paperless
+
+  webserver:
+    build: .
+    restart: always
+    depends_on:
+      - db
+      - broker
+    ports:
+      - 8000:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - data:/usr/src/paperless/data
+      - media:/usr/src/paperless/media
+      - ./export:/usr/src/paperless/export
+      - ./consume:/usr/src/paperless/consume
+    env_file: docker-compose.env
+    environment:
+      PAPERLESS_REDIS: redis://broker:6379
+      PAPERLESS_DBHOST: db
+
+
+volumes:
+  data:
+  media:
+  pgdata:

docker/local/docker-compose.sqlite.yml

@@ -0,0 +1,31 @@
+version: "3.4"
+services:
+  broker:
+    image: redis:6.0
+    restart: always
+
+  webserver:
+    build: .
+    restart: always
+    depends_on:
+      - broker
+    ports:
+      - 8000:8000
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - data:/usr/src/paperless/data
+      - media:/usr/src/paperless/media
+      - ./export:/usr/src/paperless/export
+      - ./consume:/usr/src/paperless/consume
+    env_file: docker-compose.env
+    environment:
+      PAPERLESS_REDIS: redis://broker:6379
+
+
+volumes:
+  data:
+  media:

docker/management_script.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd /usr/src/paperless/src/
-
-if [[ $(id -u) == 0 ]] ;
-then
-  gosu paperless python3 manage.py management_command "$@"
-elif [[ $(id -un) == "paperless" ]] ;
-then
-  python3 manage.py management_command "$@"
-else
-  echo "Unknown user."
-fi

docker/supervisord.conf

@@ -1,3 +1,6 @@
+[inet_http_server]         ; inet (TCP) server disabled by default
+port=127.0.0.1:9001        ; ip_address:port specifier, *:port for all iface
+
 [supervisord]
 nodaemon=true               ; start in foreground if true; default false
 logfile=/var/log/supervisord/supervisord.log ; main log file; default $CWD/supervisord.log
@@ -7,8 +10,11 @@ logfile_backups=10           ; # of main logfile backups; 0 means none, default
 loglevel=info                ; log level; default info; others: debug,warn,trace
 user=root
 
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
 [program:gunicorn]
-command=gunicorn -c /usr/src/paperless/gunicorn.conf.py paperless.asgi:application
+command=gunicorn -c /usr/src/paperless/gunicorn.conf.py -b 0.0.0.0:8000 paperless.wsgi
 user=paperless
 
 stdout_logfile=/dev/stdout

docs/administration.rst

@@ -20,14 +20,6 @@ Options available to any installation of paperless:
     metadata to a specific folder. You may import your documents into a
     fresh instance of paperless again or store your documents in another
     DMS with this export.
-*   The document exporter is also able to update an already existing export.
-    Therefore, incremental backups with ``rsync`` are entirely possible.
-
-.. caution::
-
-    You cannot import the export generated with one version of paperless in a
-    different version of paperless. The export contains an exact image of the
-    database, and migrations may change the database layout.
 
 Options available to docker installations:
 
@@ -38,7 +30,7 @@ Options available to docker installations:
     Paperless uses 3 volumes:
 
     *   ``paperless_media``: This is where your documents are stored.
-    *   ``paperless_data``: This is where auxillary data is stored. This
+    *   ``paperless_data``: This is where auxilliary data is stored. This
         folder also contains the SQLite database, if you use it.
     *   ``paperless_pgdata``: Exists only if you use PostgreSQL and contains
         the database.
@@ -56,16 +48,16 @@ Options available to bare-metal and non-docker installations:
 Restoring
 =========
 
+
+
+
 .. _administration-updating:
 
-Updating Paperless
+Updating paperless
 ##################
 
-Docker Route
-============
-
 If a new release of paperless-ng is available, upgrading depends on how you
-installed paperless-ng in the first place. The releases are available at the
+installed paperless-ng in the first place. The releases are available at
 `release page <https://github.com/jonaswinkler/paperless-ng/releases>`_.
 
 First of all, ensure that paperless is stopped.
@@ -77,157 +69,103 @@ First of all, ensure that paperless is stopped.
 
 After that, :ref:`make a backup <administration-backup>`.
 
-A.  If you pull the image from the docker hub, all you need to do is:
+A.  If you used the docker-compose file, simply download the files of the new release,
+    adjust the settings in the files (i.e., the path to your consumption directory),
+    and replace your existing docker-compose files. Then start paperless as usual,
+    which will pull the new image, and update your database, if necessary:
 
     .. code:: shell-session
 
-        $ docker-compose pull
+        $ cd /path/to/paperless
         $ docker-compose up
 
-    The docker-compose files refer to the ``latest`` version, which is always the latest
-    stable release.
+    If you see everything working, you can start paperless-ng with "-d" to have it
+    run in the background.
 
-B.  If you built the image yourself, do the following:
+    .. hint::
+
+        The released docker-compose files specify exact versions to be pulled from the hub.
+        This is to ensure that if the docker-compose files should change at some point
+        (i.e., services updates/configured differently), you wont run into trouble due to
+        docker pulling the ``latest`` image and running it in an older environment.
+        
+B.  If you built the image yourself, grab the new archive and replace your current
+    paperless folder with the new contents.
+
+    After that, make the necessary adjustments to the docker-compose.yml (i.e.,
+    adjust your consumption directory).
+
+    Build and start the new image with:
 
     .. code:: shell-session
 
-        $ git pull
-        $ ./compile-frontend.sh
+        $ cd /path/to/paperless
         $ docker-compose build
         $ docker-compose up
 
-Running ``docker-compose up`` will also apply any new database migrations.
-If you see everything working, press CTRL+C once to gracefully stop paperless.
-Then you can start paperless-ng with ``-d`` to have it run in the background.
+    If you see everything working, you can start paperless-ng with "-d" to have it
+    run in the background.
 
-    .. note::
+.. hint::
 
-        In version 0.9.14, the update process was changed. In 0.9.13 and earlier, the
-        docker-compose files specified exact versions and pull won't automatically
-        update to newer versions. In order to enable updates as described above, either
-        get the new ``docker-compose.yml`` file from `here <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`_
-        or edit the ``docker-compose.yml`` file, find the line that says
+    You can usually keep your ``docker-compose.env`` file, since this file will
+    never include mandantory configuration options. However, it is worth checking
+    out the new version of this file, since it might have new recommendations
+    on what to configure.
 
-            .. code::
 
-                image: jonaswinkler/paperless-ng:0.9.x
-
-        and replace the version with ``latest``:
-
-            .. code::
-
-                image: jonaswinkler/paperless-ng:latest
-
-Bare Metal Route
-================
+Updating paperless without docker
+=================================
 
 After grabbing the new release and unpacking the contents, do the following:
 
-1.  Update dependencies. New paperless version may require additional
-    dependencies. The dependencies required are listed in the section about
-    :ref:`bare metal installations <setup-bare_metal>`.
-
-2.  Update python requirements. Keep in mind to activate your virtual environment
-    before that, if you use one.
+1.  Update python requirements. Paperless uses
+    `Pipenv`_ for managing dependencies:
 
     .. code:: shell-session
 
-        $ pip install -r requirements.txt
+        $ pip install --upgrade pipenv
+        $ cd /path/to/paperless
+        $ pipenv install
+        $ pipenv clean
 
+    This creates a new virtual environment (or uses your existing environment)
+    and installs all dependencies into it.
+
+2.  Collect static files.
+
+    .. code:: shell-session
+
+        $ cd src
+        $ pipenv run python3 manage.py collectstatic --clear
+    
 3.  Migrate the database.
 
     .. code:: shell-session
 
         $ cd src
-        $ python3 manage.py migrate
-
-    This might not actually do anything. Not every new paperless version comes with new
-    database migrations.
-
-Ansible Route
-=============
-
-Most of the update process is automated when using the ansible role.
-
-1.  Update the role to the target release tag to make sure the ansible scripts are compatible:
-
-    .. code:: shell-session
-
-        $ ansible-galaxy install git+https://github.com/jonaswinkler/paperless-ng.git,master --force
-
-2.  Update the role variable definitions ``vars/paperless-ng.yml`` (where appropriate).
-
-3.  Run the ansible playbook you created created during :ref:`installation <setup-ansible>` again:
-
-    .. note::
-
-        When ansible detects that an update run is in progress, it backs up the entire ``paperlessng_directory`` to ``paperlessng_directory-TIMESTAMP``.
-        Updates can be rolled back by simply moving the timestamped folder back to the original location.
-        If the update succeeds and you want to continue using the new release, please don't forget to delete the backup folder.
-
-    .. code:: shell-session
-
-        $ ansible-playbook playbook.yml
-
-
-Downgrading Paperless
-#####################
-
-Downgrades are possible. However, some updates also contain database migrations (these change the layout of the database and may move data).
-In order to move back from a version that applied database migrations, you'll have to revert the database migration *before* downgrading,
-and then downgrade paperless.
-
-This table lists the compatible versions for each database migration number.
-
-+------------------+-----------------+
-| Migration number | Version range   |
-+------------------+-----------------+
-| 1011             | 1.0.0           |
-+------------------+-----------------+
-| 1012             | 1.1.0 - 1.2.1   |
-+------------------+-----------------+
-| 1014             | 1.3.0 - 1.3.1   |
-+------------------+-----------------+
-| 1016             | 1.3.2 - current |
-+------------------+-----------------+
-
-Execute the following management command to migrate your database:
-
-.. code:: shell-session
-
-    $ python3 manage.py migrate documents <migration number>
-
-.. note::
-
-    Some migrations cannot be undone. The command will issue errors if that happens.
-
-.. _utilities-management-commands:
+        $ pipenv run python3 manage.py migrate
 
+        
 Management utilities
 ####################
 
 Paperless comes with some management commands that perform various maintenance
-tasks on your paperless instance. You can invoke these commands in the following way:
+tasks on your paperless instance. You can invoke these commands either by
 
-With docker-compose, while paperless is running:
-
-.. code:: shell-session
+.. code:: bash
 
     $ cd /path/to/paperless
-    $ docker-compose exec webserver <command> <arguments>
+    $ docker-compose run --rm webserver <command> <arguments>
 
-With docker, while paperless is running:
+or
 
-.. code:: shell-session
-
-    $ docker exec -it <container-name> <command> <arguments>
-
-Bare metal:
-
-.. code:: shell-session
+.. code:: bash
 
     $ cd /path/to/paperless/src
-    $ python3 manage.py <command> <arguments>
+    $ pipenv run python manage.py <command> <arguments>
+
+depending on whether you use docker or not.
 
 All commands have built-in help, which can be accessed by executing them with
 the argument ``--help``.
@@ -240,16 +178,9 @@ Document exporter
 The document exporter exports all your data from paperless into a folder for
 backup or migration to another DMS.
 
-If you use the document exporter within a cronjob to backup your data you might use the ``-T`` flag behind exec to suppress "The input device is not a TTY" errors. For example: ``docker-compose exec -T webserver document_exporter ../export``
-
 .. code::
 
-    document_exporter target [-c] [-f] [-d]
-
-    optional arguments:
-    -c, --compare-checksums
-    -f, --use-filename-format
-    -d, --delete
+    document_exporter target
 
 ``target`` is a folder to which the data gets written. This includes documents,
 thumbnails and a ``manifest.json`` file. The manifest contains all metadata from
@@ -259,24 +190,6 @@ When you use the provided docker compose script, specify ``../export`` as the
 target. This path inside the container is automatically mounted on your host on
 the folder ``export``.
 
-If the target directory already exists and contains files, paperless will assume
-that the contents of the export directory are a previous export and will attempt
-to update the previous export. Paperless will only export changed and added files.
-Paperless determines whether a file has changed by inspecting the file attributes
-"date/time modified" and "size". If that does not work out for you, specify
-``--compare-checksums`` and paperless will attempt to compare file checksums instead.
-This is slower.
-
-Paperless will not remove any existing files in the export directory. If you want
-paperless to also remove files that do not belong to the current export such as files
-from deleted documents, specify ``--delete``. Be careful when pointing paperless to
-a directory that already contains other files.
-
-The filenames generated by this command follow the format
-``[date created] [correspondent] [title].[extension]``.
-If you want paperless to use ``PAPERLESS_FILENAME_FORMAT`` for exported filenames
-instead, specify ``--use-filename-format``.
-
 
 .. _utilities-importer:
 
@@ -334,12 +247,12 @@ your already processed documents.
 
 When multiple document types or correspondents match a single document,
 the retagger won't assign these to the document. Specify ``--use-first``
-to override this behavior and just use the first correspondent or type
+to override this behaviour and just use the first correspondent or type
 it finds. This option does not apply to tags, since any amount of tags
 can be applied to a document.
 
 Finally, ``-f`` specifies that you wish to overwrite already assigned
-correspondents, types and/or tags. The default behavior is to not
+correspondents, types and/or tags. The default behaviour is to not
 assign correspondents and types to documents that have this data already
 assigned. ``-f`` works differently for tags: By default, only additional tags get
 added to documents, no tags will be removed. With ``-f``, tags that don't
@@ -361,7 +274,6 @@ management command:
 
 This command takes no arguments.
 
-.. _`administration-index`:
 
 Managing the document search index
 ==================================
@@ -407,34 +319,6 @@ the naming scheme.
 The command takes no arguments and processes all your documents at once.
 
 
-.. _utilities-sanity-checker:
-
-Sanity checker
-==============
-
-Paperless has a built-in sanity checker that inspects your document collection for issues.
-
-The issues detected by the sanity checker are as follows:
-
-* Missing original files.
-* Missing archive files.
-* Inaccessible original files due to improper permissions.
-* Inaccessible archive files due to improper permissions.
-* Corrupted original documents by comparing their checksum against what is stored in the database.
-* Corrupted archive documents by comparing their checksum against what is stored in the database.
-* Missing thumbnails.
-* Inaccessible thumbnails due to improper permissions.
-* Documents without any content (warning).
-* Orphaned files in the media directory (warning). These are files that are not referenced by any document im paperless.
-
-
-.. code::
-
-    document_sanity_checker
-
-The command takes no arguments. Depending on the size of your document archive, this may take some time.
-
-
 Fetching e-mail
 ===============
 
@@ -448,42 +332,6 @@ command:
 
 The command takes no arguments and processes all your mail accounts and rules.
 
-.. _utilities-archiver:
-
-Creating archived documents
-===========================
-
-Paperless stores archived PDF/A documents alongside your original documents.
-These archived documents will also contain selectable text for image-only
-originals.
-These documents are derived from the originals, which are always stored
-unmodified. If coming from an earlier version of paperless, your documents
-won't have archived versions.
-
-This command creates PDF/A documents for your documents.
-
-.. code::
-
-    document_archiver --overwrite --document <id>
-
-This command will only attempt to create archived documents when no archived
-document exists yet, unless ``--overwrite`` is specified. If ``--document <id>``
-is specified, the archiver will only process that document.
-
-.. note::
-
-    This command essentially performs OCR on all your documents again,
-    according to your settings. If you run this with ``PAPERLESS_OCR_MODE=redo``,
-    it will potentially run for a very long time. You can cancel the command
-    at any time, since this command will skip already archived versions the next time
-    it is run.
-
-.. note::
-
-    Some documents will cause errors and cannot be converted into PDF/A documents,
-    such as encrypted PDF documents. The archiver will skip over these documents
-    each time it sees them.
-
 .. _utilities-encyption:
 
 Managing encryption
@@ -493,32 +341,51 @@ Documents can be stored in Paperless using GnuPG encryption.
 
 .. danger::
 
-    Encryption is deprecated since paperless-ng 0.9 and doesn't really provide any
+    Encryption is depreceated since paperless-ng 0.9 and doesn't really provide any
     additional security, since you have to store the passphrase in a configuration
     file on the same system as the encrypted documents for paperless to work.
     Furthermore, the entire text content of the documents is stored plain in the
     database, even if your documents are encrypted. Filenames are not encrypted as
     well.
-
+    
     Also, the web server provides transparent access to your encrypted documents.
 
     Consider running paperless on an encrypted filesystem instead, which will then
     at least provide security against physical hardware theft.
 
+.. code::
+
+    change_storage_type [--passphrase PASSPHRASE] {gpg,unencrypted} {gpg,unencrypted}
+
+    positional arguments:
+      {gpg,unencrypted}     The state you want to change your documents from
+      {gpg,unencrypted}     The state you want to change your documents to
+
+    optional arguments:
+      --passphrase PASSPHRASE
 
 Enabling encryption
 -------------------
 
-Enabling encryption is no longer supported.
-
-
-Disabling encryption
---------------------
-
-Basic usage to disable encryption of your document store:
+Basic usage to enable encryption of your document store (**USE A MORE SECURE PASSPHRASE**):
 
 (Note: If ``PAPERLESS_PASSPHRASE`` isn't set already, you need to specify it here)
 
 .. code::
 
-    decrypt_documents [--passphrase SECR3TP4SSPHRA$E]
+    change_storage_type [--passphrase SECR3TP4SSPHRA$E] unencrypted gpg
+
+
+Disabling encryption
+--------------------
+
+Basic usage to enable encryption of your document store:
+
+(Note: Again, if ``PAPERLESS_PASSPHRASE`` isn't set already, you need to specify it here)
+
+.. code::
+
+    change_storage_type [--passphrase SECR3TP4SSPHRA$E] gpg unencrypted
+
+
+.. _Pipenv: https://pipenv.pypa.io/en/latest/

docs/advanced_usage.rst

@@ -5,18 +5,96 @@ Advanced topics
 Paperless offers a couple features that automate certain tasks and make your life
 easier.
 
-.. _advanced-matching:
+Guesswork
+#########
+
+
+Any document you put into the consumption directory will be consumed, but if
+you name the file right, it'll automatically set some values in the database
+for you.  This is is the logic the consumer follows:
+
+1. Try to find the correspondent, title, and tags in the file name following
+   the pattern: ``Date - Correspondent - Title - tag,tag,tag.pdf``.  Note that
+   the format of the date is **rigidly defined** as ``YYYYMMDDHHMMSSZ`` or
+   ``YYYYMMDDZ``.  The ``Z`` refers "Zulu time" AKA "UTC".
+   The tags are optional, so the format ``Date - Correspondent - Title.pdf``
+   works as well.
+2. If that doesn't work, we skip the date and try this pattern:
+   ``Correspondent - Title - tag,tag,tag.pdf``.
+3. If that doesn't work, we try to find the correspondent and title in the file
+   name following the pattern: ``Correspondent - Title.pdf``.
+4. If that doesn't work, just assume that the name of the file is the title.
+
+So given the above, the following examples would work as you'd expect:
+
+* ``20150314000700Z - Some Company Name - Invoice 2016-01-01 - money,invoices.pdf``
+* ``20150314Z - Some Company Name - Invoice 2016-01-01 - money,invoices.pdf``
+* ``Some Company Name - Invoice 2016-01-01 - money,invoices.pdf``
+* ``Another Company - Letter of Reference.jpg``
+* ``Dad's Recipe for Pancakes.png``
+
+These however wouldn't work:
+
+* ``2015-03-14 00:07:00 UTC - Some Company Name, Invoice 2016-01-01, money, invoices.pdf``
+* ``2015-03-14 - Some Company Name, Invoice 2016-01-01, money, invoices.pdf``
+* ``Some Company Name, Invoice 2016-01-01, money, invoices.pdf``
+* ``Another Company- Letter of Reference.jpg``
+
+Do I have to be so strict about naming?
+=======================================
+
+Rather than using the strict document naming rules, one can also set the option
+``PAPERLESS_FILENAME_DATE_ORDER`` in ``paperless.conf`` to any date order
+that is accepted by dateparser_. Doing so will cause ``paperless`` to default
+to any date format that is found in the title, instead of a date pulled from
+the document's text, without requiring the strict formatting of the document
+filename as described above.
+
+.. _dateparser: https://github.com/scrapinghub/dateparser/blob/v0.7.0/docs/usage.rst#settings
+
+.. _advanced-transforming_filenames:
+
+Transforming filenames for parsing
+==================================
+
+Some devices can't produce filenames that can be parsed by the default
+parser. By configuring the option ``PAPERLESS_FILENAME_PARSE_TRANSFORMS`` in
+``paperless.conf`` one can add transformations that are applied to the filename
+before it's parsed.
+
+The option contains a list of dictionaries of regular expressions (key:
+``pattern``) and replacements (key: ``repl``) in JSON format, which are
+applied in order by passing them to ``re.subn``. Transformation stops
+after the first match, so at most one transformation is applied. The general
+syntax is
+
+.. code:: python
+
+   [{"pattern":"pattern1", "repl":"repl1"}, {"pattern":"pattern2", "repl":"repl2"}, ..., {"pattern":"patternN", "repl":"replN"}]
+
+The example below is for a Brother ADS-2400N, a scanner that allows
+different names to different hardware buttons (useful for handling
+multiple entities in one instance), but insists on adding ``_<count>``
+to the filename.
+
+.. code:: python
+
+   # Brother profile configuration, support "Name_Date_Count" (the default
+   # setting) and "Name_Count" (use "Name" as tag and "Count" as title).
+   PAPERLESS_FILENAME_PARSE_TRANSFORMS=[{"pattern":"^([a-z]+)_(\\d{8})_(\\d{6})_([0-9]+)\\.", "repl":"\\2\\3Z - \\4 - \\1."}, {"pattern":"^([a-z]+)_([0-9]+)\\.", "repl":" - \\2 - \\1."}]
+
 
 Matching tags, correspondents and document types
 ################################################
 
-Paperless will compare the matching algorithms defined by every tag and
-correspondent already set in your database to see if they apply to the text in
-a document.  In other words, if you defined a tag called ``Home Utility``
-that had a ``match`` property of ``bc hydro`` and a ``matching_algorithm`` of
-``literal``, Paperless will automatically tag your newly-consumed document with
-your ``Home Utility`` tag so long as the text ``bc hydro`` appears in the body
-of the document somewhere.
+After the consumer has tried to figure out what it could from the file name,
+it starts looking at the content of the document itself.  It will compare the
+matching algorithms defined by every tag and correspondent already set in your
+database to see if they apply to the text in that document.  In other words,
+if you defined a tag called ``Home Utility`` that had a ``match`` property of
+``bc hydro`` and a ``matching_algorithm`` of ``literal``, Paperless will
+automatically tag your newly-consumed document with your ``Home Utility`` tag
+so long as the text ``bc hydro`` appears in the body of the document somewhere.
 
 The matching logic is quite powerful, and supports searching the text of your
 document with different algorithms, and as such, some experimentation may be
@@ -67,9 +145,7 @@ America are tagged with the tag "bofa_123" and the matching algorithm of this
 tag is set to *Auto*, this neural network will examine your documents and
 automatically learn when to assign this tag.
 
-Paperless tries to hide much of the involved complexity with this approach.
-However, there are a couple caveats you need to keep in mind when using this
-feature:
+There are a couple caveats you need to keep in mind when using this feature:
 
 * Changes to your documents are not immediately reflected by the matching
   algorithm. The neural network needs to be *trained* on your documents after
@@ -89,11 +165,6 @@ feature:
   has the correspondent "Very obscure web shop I bought something five years
   ago", it will probably not assign this correspondent automatically if you buy
   something from them again. The more documents, the better.
-* Paperless also needs a reasonable amount of negative examples to decide when
-  not to assign a certain tag, correspondent or type. This will usually be the
-  case as you start filling up paperless with documents. Example: If all your
-  documents are either from "Webshop" and "Bank", paperless will assign one of
-  these correspondents to ANY new document, if both are set to automatic matching.
 
 Hooking into the consumption process
 ####################################
@@ -182,11 +253,11 @@ By default, paperless stores your documents in the media directory and renames t
 using the identifier which it has assigned to each document. You will end up getting
 files like ``0000123.pdf`` in your media directory. This isn't necessarily a bad
 thing, because you normally don't have to access these files manually. However, if
-you wish to name your files differently, you can do that by adjusting the
-``PAPERLESS_FILENAME_FORMAT`` configuration option.
+you wish to name your files differently, you can do that by adjustng the
+``PAPERLESS_FILENAME_FORMAT`` settings variable.
 
-This variable allows you to configure the filename (folders are allowed) using
-placeholders. For example, configuring this to
+This variable allows you to configure the filename (folders are allowed!) using
+placeholders. For example, setting
 
 .. code:: bash
 
@@ -197,16 +268,17 @@ will create a directory structure as follows:
 .. code::
 
     2019/
-      My bank/
-        Statement January.pdf
-        Statement February.pdf
+      my_bank/
+        statement-january-0000001.pdf
+        statement-february-0000002.pdf
     2020/
-      My bank/
-        Statement January.pdf
-        Letter.pdf
-        Letter_01.pdf
-      Shoe store/
-        My new shoes.pdf
+      my_bank/
+        statement-january-0000003.pdf
+      shoe_store/
+        my_new_shoes-0000004.pdf
+
+Paperless appends the unique identifier of each document to the filename. This
+avoides filename clashes.
 
 .. danger::
 
@@ -216,10 +288,7 @@ will create a directory structure as follows:
 
 Paperless provides the following placeholders withing filenames:
 
-* ``{asn}``: The archive serial number of the document, or "none".
 * ``{correspondent}``: The name of the correspondent, or "none".
-* ``{document_type}``: The name of the document type, or "none".
-* ``{tag_list}``: A comma separated list of all tags assigned to the document.
 * ``{title}``: The title of the document.
 * ``{created}``: The full date and time the document was created.
 * ``{created_year}``: Year created only.
@@ -229,15 +298,10 @@ Paperless provides the following placeholders withing filenames:
 * ``{added_year}``: Year added only.
 * ``{added_month}``: Month added only (number 1-12).
 * ``{added_day}``: Day added only (number 1-31).
+* ``{tags}``: I don't know how this works. Look at the source.
 
-
-Paperless will try to conserve the information from your database as much as possible.
-However, some characters that you can use in document titles and correspondent names (such
-as ``: \ /`` and a couple more) are not allowed in filenames and will be replaced with dashes.
-
-If paperless detects that two documents share the same filename, paperless will automatically
-append ``_01``, ``_02``, etc to the filename. This happens if all the placeholders in a filename
-evaluate to the same value.
+Paperless will convert all values for the placeholders into values which are safe
+for use in filenames.
 
 .. hint::
 

docs/api.rst

@@ -13,55 +13,23 @@ available filters and ordering fields.
 
 The API provides 5 main endpoints:
 
-*   ``/api/documents/``: Full CRUD support, except POSTing new documents. See below.
 *   ``/api/correspondents/``: Full CRUD support.
 *   ``/api/document_types/``: Full CRUD support.
+*   ``/api/documents/``: Full CRUD support, except POSTing new documents. See below.
 *   ``/api/logs/``: Read-Only.
 *   ``/api/tags/``: Full CRUD support.
 
-All of these endpoints except for the logging endpoint
+All of these endpoints except for the logging endpoint 
 allow you to fetch, edit and delete individual objects
 by appending their primary key to the path, for example ``/api/documents/454/``.
 
-The objects served by the document endpoint contain the following fields:
-
-*   ``id``: ID of the document. Read-only.
-*   ``title``: Title of the document.
-*   ``content``: Plain text content of the document.
-*   ``tags``: List of IDs of tags assigned to this document, or empty list.
-*   ``document_type``: Document type of this document, or null.
-*   ``correspondent``:  Correspondent of this document or null.
-*   ``created``: The date at which this document was created.
-*   ``modified``: The date at which this document was last edited in paperless. Read-only.
-*   ``added``: The date at which this document was added to paperless. Read-only.
-*   ``archive_serial_number``: The identifier of this document in a physical document archive.
-*   ``original_file_name``: Verbose filename of the original document. Read-only.
-*   ``archived_file_name``: Verbose filename of the archived document. Read-only. Null if no archived document is available.
-
-
-Downloading documents
-#####################
-
 In addition to that, the document endpoint offers these additional actions on
 individual documents:
 
-*   ``/api/documents/<pk>/download/``: Download the document.
-*   ``/api/documents/<pk>/preview/``: Display the document inline,
-    without downloading it.
+*   ``/api/documents/<pk>/download/``: Download the original document.
 *   ``/api/documents/<pk>/thumb/``: Download the PNG thumbnail of a document.
-
-Paperless generates archived PDF/A documents from consumed files and stores both
-the original files as well as the archived files. By default, the endpoints
-for previews and downloads serve the archived file, if it is available.
-Otherwise, the original file is served.
-Some document cannot be archived.
-
-The endpoints correctly serve the response header fields ``Content-Disposition``
-and ``Content-Type`` to indicate the filename for download and the type of content of
-the document.
-
-In order to download or preview the original document when an archied document is available,
-supply the query parameter ``original=true``.
+*   ``/api/documents/<pk>/preview/``: Display the original document inline,
+    without downloading it.
 
 .. hint::
 
@@ -70,134 +38,98 @@ supply the query parameter ``original=true``.
     are in place. However, if you use these old URLs to access documents, you
     should update your app or script to use the new URLs.
 
+Searching for documents
+#######################
 
-Getting document metadata
-#########################
+Paperless-ng offers API endpoints for full text search. These are as follows:
 
-The api also has an endpoint to retrieve read-only metadata about specific documents. this
-information is not served along with the document objects, since it requires reading
-files and would therefore slow down document lists considerably.
+``/api/search/``
+================
 
-Access the metadata of a document with an ID ``id`` at ``/api/documents/<id>/metadata/``.
+Get search results based on a query.
 
-The endpoint reports the following data:
+Query parameters:
 
-*   ``original_checksum``: MD5 checksum of the original document.
-*   ``original_size``: Size of the original document, in bytes.
-*   ``original_mime_type``: Mime type of the original document.
-*   ``media_filename``: Current filename of the document, under which it is stored inside the media directory.
-*   ``has_archive_version``: True, if this document is archived, false otherwise.
-*   ``original_metadata``: A list of metadata associated with the original document. See below.
-*   ``archive_checksum``: MD5 checksum of the archived document, or null.
-*   ``archive_size``: Size of the archived document in bytes, or null.
-*   ``archive_metadata``: Metadata associated with the archived document, or null. See below.
+*   ``query``: The query string. See
+    `here <https://whoosh.readthedocs.io/en/latest/querylang.html>`_
+    for details on the syntax.
+*   ``page``: Specify the page you want to retrieve. Each page
+    contains 10 search results and the first page is ``page=1``, which
+    is the default if this is omitted.
 
-File metadata is reported as a list of objects in the following form:
+Result list object returned by the endpoint:
+
+.. code:: json
+
+    {
+        "count": 1,
+        "page": 1,
+        "page_count": 1,
+        "results": [
+            
+        ]
+    }
+
+*   ``count``: The approximate total number of results.
+*   ``page``: The page returned to you. This might be different from
+    the page you requested, if you requested a page that is behind
+    the last page. In that case, the last page is returned.
+*   ``page_count``: The total number of pages.
+*   ``results``: A list of result objects on the current page.
+
+Result object:
+
+.. code:: json
+
+    {
+        "id": 1,
+        "highlights": [
+            
+        ],
+        "score": 6.34234,
+        "rank": 23,
+        "document": {
+            
+        }
+    }
+
+*   ``id``: the primary key of the found document
+*   ``highlights``: an object containing parseable highlights for the result.
+    See below.
+*   ``score``: The score assigned to the document. A higher score indicates a
+    better match with the query. Search results are sorted descending by score.
+*   ``rank``: the position of the document within the entire search results list.
+*   ``document``: The full json of the document, as returned by
+    ``/api/documents/<id>/``.
+
+Highlights object:
+
+Highlights are provided as a list of fragments. A fragment is a longer section of
+text from the original document.
+Each fragment contains a list of strings, and some of them are marked as a highlight.
 
 .. code:: json
 
     [
-        {
-            "namespace": "http://ns.adobe.com/pdf/1.3/",
-            "prefix": "pdf",
-            "key": "Producer",
-            "value": "SparklePDF, Fancy edition"
-        },
-    ]
-
-``namespace`` and ``prefix`` can be null. The actual metadata reported depends on the file type and the metadata
-available in that specific document. Paperless only reports PDF metadata at this point.
-
-Authorization
-#############
-
-The REST api provides three different forms of authentication.
-
-1.  Basic authentication
-
-    Authorize by providing a HTTP header in the form
-
-    .. code::
-
-        Authorization: Basic <credentials>
-
-    where ``credentials`` is a base64-encoded string of ``<username>:<password>``
-
-2.  Session authentication
-
-    When you're logged into paperless in your browser, you're automatically
-    logged into the API as well and don't need to provide any authorization
-    headers.
-
-3.  Token authentication
-
-    Paperless also offers an endpoint to acquire authentication tokens.
-
-    POST a username and password as a form or json string to ``/api/token/``
-    and paperless will respond with a token, if the login data is correct.
-    This token can be used to authenticate other requests with the
-    following HTTP header:
-
-    .. code::
-
-        Authorization: Token <token>
-
-    Tokens can be managed and revoked in the paperless admin.
-
-Searching for documents
-#######################
-
-Full text searching is available on the ``/api/documents/`` endpoint. Two specific
-query parameters cause the API to return full text search results:
-
-*   ``/api/documents/?query=your%20search%20query``: Search for a document using a full text query.
-    For details on the syntax, see :ref:`basic-usage_searching`.
-
-*   ``/api/documents/?more_like=1234``: Search for documents similar to the document with id 1234.
-
-Pagination works exactly the same as it does for normal requests on this endpoint.
-
-Certain limitations apply to full text queries:
-
-*   Results are always sorted by search score. The results matching the query best will show up first.
-
-*   Only a small subset of filtering parameters are supported.
-
-Furthermore, each returned document has an additional ``__search_hit__`` attribute with various information
-about the search results:
-
-.. code::
-
-    {
-        "count": 31,
-        "next": "http://localhost:8000/api/documents/?page=2&query=test",
-        "previous": null,
-        "results": [
-
-            ...
-
-            {
-                "id": 123,
-                "title": "title",
-                "content": "content",
-
-                ...
-
-                "__search_hit__": {
-                    "score": 0.343,
-                    "highlights": "text <span class=\"match\">Test</span> text",
-                    "rank": 23
-                }
-            },
-
-            ...
-
+        [
+            {"text": "This is a sample text with a "},
+            {"text": "highlighted", "term": 0},
+            {"text": " word."}
+        ],
+        [
+            {"text": "Another", "term": 1},
+            {"text": " fragment with a highlight."}
         ]
-    }
+    ]
+    
 
-*   ``score`` is an indication how well this document matches the query relative to the other search results.
-*   ``highlights`` is an excerpt from the document content and highlights the search terms with ``<span>`` tags as shown above.
-*   ``rank`` is the index of the search results. The first result will have rank 0.
+
+When ``term`` is present within a string, the word within ``text`` should be highlighted.
+The term index groups multiple matches together and words with the same index
+should get identical highlighting.
+A client may use this example to produce the following output:
+
+... This is a sample text with a **highlighted** word. ... **Another** fragment with a highlight. ...
 
 ``/api/search/autocomplete/``
 =============================
@@ -234,67 +166,8 @@ The API provides a special endpoint for file uploads:
 
 POST a multipart form to this endpoint, where the form field ``document`` contains
 the document that you want to upload to paperless. The filename is sanitized and
-then used to store the document in a temporary directory, and the consumer will
-be instructed to consume the document from there.
+then used to store the document in the consumption folder, where the consumer will
+detect the document and process it as any other document.
 
-The endpoint supports the following optional form fields:
-
-*   ``title``: Specify a title that the consumer should use for the document.
-*   ``correspondent``: Specify the ID of a correspondent that the consumer should use for the document.
-*   ``document_type``: Similar to correspondent.
-*   ``tags``: Similar to correspondent. Specify this multiple times to have multiple tags added
-    to the document.
-
-The endpoint will immediately return "OK" if the document consumption process
-was started successfully. No additional status information about the consumption
-process itself is available, since that happens in a different process.
-
-
-.. _api-versioning:
-
-API Versioning
-##############
-
-The REST API is versioned since Paperless-ng 1.3.0.
-
-* Versioning ensures that changes to the API don't break older clients.
-* Clients specify the specific version of the API they wish to use with every request and Paperless will handle the request using the specified API version.
-* Even if the underlying data model changes, older API versions will always serve compatible data.
-* If no version is specified, Paperless will serve version 1 to ensure compatibility with older clients that do not request a specific API version.
-
-API versions are specified by submitting an additional HTTP ``Accept`` header with every request:
-
-.. code::
-
-    Accept: application/json; version=6
-
-If an invalid version is specified, Paperless 1.3.0 will respond with "406 Not Acceptable" and an error message in the body.
-Earlier versions of Paperless will serve API version 1 regardless of whether a version is specified via the ``Accept`` header.
-
-If a client wishes to verify whether it is compatible with any given server, the following procedure should be performed:
-
-1.  Perform an *authenticated* request against any API endpoint. If the server is on version 1.3.0 or newer, the server will
-    add two custom headers to the response:
-
-    .. code::
-
-        X-Api-Version: 2
-        X-Version: 1.3.0
-
-2.  Determine whether the client is compatible with this server based on the presence/absence of these headers and their values if present.
-
-
-API Changelog
-=============
-
-Version 1
----------
-
-Initial API version.
-
-Version 2
----------
-
-* Added field ``Tag.color``. This read/write string field contains a hex color such as ``#a6cee3``.
-* Added read-only field ``Tag.text_color``. This field contains the text color to use for a specific tag, which is either black or white depending on the brightness of ``Tag.color``.
-* Removed field ``Tag.colour``.
+The endpoint will immediately return "OK." if the document was stored in the
+consumption directory.

docs/conf.py

@@ -1,21 +1,48 @@
-import sphinx_rtd_theme
-
+# -*- coding: utf-8 -*-
+#
+# Paperless documentation build configuration file, created by
+# sphinx-quickstart on Mon Oct 26 18:36:52 2015.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
 
 __version__ = None
 exec(open("../src/paperless/version.py").read())
 
 
+# Believe it or not, this is the officially sanctioned way to add custom CSS.
+def setup(app):
+    app.add_stylesheet("custom.css")
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.imgmath',
     'sphinx.ext.viewcode',
-    'sphinx_rtd_theme',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-# templates_path = ['_templates']
+templates_path = ['_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -28,7 +55,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Paperless-ng'
-copyright = u'2021, Daniel Quinn, Jonas Winkler'
+copyright = u'2015, Daniel Quinn'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -88,7 +115,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'sphinx_rtd_theme'
+html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -168,6 +195,20 @@ html_static_path = ['_static']
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'paperless'
 
+
+#
+# Attempt to use the ReadTheDocs theme.  If it's not installed, fallback to
+# the default.
+#
+
+try:
+    import sphinx_rtd_theme
+    html_theme = "sphinx_rtd_theme"
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+except ImportError as e:
+    print("error " + str(e))
+    pass
+
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {

docs/configuration.rst

@@ -35,30 +35,24 @@ PAPERLESS_DBHOST=<hostname>
 
 PAPERLESS_DBPORT=<port>
     Adjust port if necessary.
-
+    
     Default is 5432.
 
 PAPERLESS_DBNAME=<name>
     Database name in PostgreSQL.
-
+    
     Defaults to "paperless".
 
 PAPERLESS_DBUSER=<name>
     Database user in PostgreSQL.
-
+    
     Defaults to "paperless".
 
 PAPERLESS_DBPASS=<password>
     Database password for PostgreSQL.
-
+    
     Defaults to "paperless".
 
-PAPERLESS_DBSSLMODE=<mode>
-    SSL mode to use when connecting to PostgreSQL.
-
-    See `the official documentation about sslmode <https://www.postgresql.org/docs/current/libpq-ssl.html>`_.
-
-    Default is ``prefer``.
 
 Paths and folders
 #################
@@ -72,13 +66,13 @@ PAPERLESS_CONSUMPTION_DIR=<path>
     container. Change the local consumption directory in the docker-compose.yml
     file instead.
 
-    Defaults to "../consume/", relative to the "src" directory.
+    Defaults to "../consume", relative to the "src" directory.
 
 PAPERLESS_DATA_DIR=<path>
-    This is where paperless stores all its data (search index, SQLite database,
+    This is where paperless stores all its data (search index, sqlite database,
     classification model, etc).
 
-    Defaults to "../data/", relative to the "src" directory.
+    Defaults to "../data", relative to the "src" directory.
 
 PAPERLESS_MEDIA_ROOT=<path>
     This is where your documents and thumbnails are stored.
@@ -86,7 +80,7 @@ PAPERLESS_MEDIA_ROOT=<path>
     You can set this and PAPERLESS_DATA_DIR to the same folder to have paperless
     store all its data within the same volume.
 
-    Defaults to "../media/", relative to the "src" directory.
+    Defaults to "../media", relative to the "src" directory.
 
 PAPERLESS_STATICDIR=<path>
     Override the default STATIC_ROOT here.  This is where all static files
@@ -94,7 +88,7 @@ PAPERLESS_STATICDIR=<path>
 
     Unless you're doing something fancy, there is no need to override this.
 
-    Defaults to "../static/", relative to the "src" directory.
+    Defaults to "../static", relative to the "src" directory.
 
 PAPERLESS_FILENAME_FORMAT=<format>
     Changes the filenames paperless uses to store documents in the media directory.
@@ -102,30 +96,11 @@ PAPERLESS_FILENAME_FORMAT=<format>
 
     Default is none, which disables this feature.
 
-PAPERLESS_LOGGING_DIR=<path>
-    This is where paperless will store log files.
-
-    Defaults to "``PAPERLESS_DATA_DIR``/log/".
-
-
-Logging
-#######
-
-PAPERLESS_LOGROTATE_MAX_SIZE=<num>
-    Maximum file size for log files before they are rotated, in bytes.
-
-    Defaults to 1 MiB.
-
-PAPERLESS_LOGROTATE_MAX_BACKUPS=<num>
-    Number of rotated log files to keep.
-
-    Defaults to 20.
-
 Hosting & Security
 ##################
 
 PAPERLESS_SECRET_KEY=<key>
-    Paperless uses this to make session tokens. If you expose paperless on the
+    Paperless uses this to make session tokens. If you exose paperless on the
     internet, you need to change this, since the default secret is well known.
 
     Use any sequence of characters. The more, the better. You don't need to
@@ -138,7 +113,7 @@ PAPERLESS_ALLOWED_HOSTS<comma-separated-list>
     really should set this value to the domain name you're using.  Failing to do
     so leaves you open to HTTP host header attacks:
     https://docs.djangoproject.com/en/3.1/topics/security/#host-header-validation
-
+    
     Just remember that this is a comma-separated list, so "example.com" is fine,
     as is "example.com,www.example.com", but NOT " example.com" or "example.com,"
 
@@ -154,308 +129,18 @@ PAPERLESS_FORCE_SCRIPT_NAME=<path>
     To host paperless under a subpath url like example.com/paperless you set
     this value to /paperless. No trailing slash!
 
+    .. note::
+
+        I don't know if this works in paperless-ng. Probably not.
+    
     Defaults to none, which hosts paperless at "/".
 
 PAPERLESS_STATIC_URL=<path>
     Override the STATIC_URL here.  Unless you're hosting Paperless off a
     subdomain like /paperless/, you probably don't need to change this.
-
+    
     Defaults to "/static/".
 
-PAPERLESS_AUTO_LOGIN_USERNAME=<username>
-    Specify a username here so that paperless will automatically perform login
-    with the selected user.
-
-    .. danger::
-
-        Do not use this when exposing paperless on the internet. There are no
-        checks in place that would prevent you from doing this.
-
-    Defaults to none, which disables this feature.
-
-PAPERLESS_ADMIN_USER=<username>
-    If this environment variable is specified, Paperless automatically creates
-    a superuser with the provided username at start. This is useful in cases
-    where you can not run the `createsuperuser` command seperately, such as Kubernetes
-    or AWS ECS.
-
-    Requires `PAPERLESS_ADMIN_PASSWORD` to be set.
-
-    .. note::
-
-        This will not change an existing [super]user's password, nor will
-        it recreate a user that already exists. You can leave this throughout
-        the lifecycle of the containers.
-
-PAPERLESS_ADMIN_MAIL=<email>
-    (Optional) Specify superuser email address. Only used when
-    `PAPERLESS_ADMIN_USER` is set.
-
-    Defaults to ``root@localhost``.
-
-PAPERLESS_ADMIN_PASSWORD=<password>
-    Only used when `PAPERLESS_ADMIN_USER` is set.
-    This will be the password of the automatically created superuser.
-
-
-PAPERLESS_COOKIE_PREFIX=<str>
-    Specify a prefix that is added to the cookies used by paperless to identify
-    the currently logged in user. This is useful for when you're running two
-    instances of paperless on the same host.
-
-    After changing this, you will have to login again.
-
-    Defaults to ``""``, which does not alter the cookie names.
-
-PAPERLESS_ENABLE_HTTP_REMOTE_USER=<bool>
-    Allows authentication via HTTP_REMOTE_USER which is used by some SSO
-    applications.
-
-    .. warning::
-
-        This will allow authentication by simply adding a ``Remote-User: <username>`` header
-        to a request. Use with care! You especially *must* ensure that any such header is not
-        passed from your proxy server to paperless.
-
-        If you're exposing paperless to the internet directly, do not use this.
-
-        Also see the warning `in the official documentation <https://docs.djangoproject.com/en/3.1/howto/auth-remote-user/#configuration>`.
-
-    Defaults to `false` which disables this feature.
-
-PAPERLESS_HTTP_REMOTE_USER_HEADER_NAME=<str>
-    If `PAPERLESS_ENABLE_HTTP_REMOTE_USER` is enabled, this property allows to
-    customize the name of the HTTP header from which the authenticated username
-    is extracted. Values are in terms of
-    [HttpRequest.META](https://docs.djangoproject.com/en/3.1/ref/request-response/#django.http.HttpRequest.META).
-    Thus, the configured value must start with `HTTP_` followed by the
-    normalized actual header name.
-
-    Defaults to `HTTP_REMOTE_USER`.
-
-.. _configuration-ocr:
-
-OCR settings
-############
-
-Paperless uses `OCRmyPDF <https://ocrmypdf.readthedocs.io/en/latest/>`_ for
-performing OCR on documents and images. Paperless uses sensible defaults for
-most settings, but all of them can be configured to your needs.
-
-PAPERLESS_OCR_LANGUAGE=<lang>
-    Customize the language that paperless will attempt to use when
-    parsing documents.
-
-    It should be a 3-letter language code consistent with ISO
-    639: https://www.loc.gov/standards/iso639-2/php/code_list.php
-
-    Set this to the language most of your documents are written in.
-
-    This can be a combination of multiple languages such as ``deu+eng``,
-    in which case tesseract will use whatever language matches best.
-    Keep in mind that tesseract uses much more cpu time with multiple
-    languages enabled.
-
-    Defaults to "eng".
-
-		Note: If your language contains a '-' such as chi-sim, you must use chi_sim
-
-PAPERLESS_OCR_MODE=<mode>
-    Tell paperless when and how to perform ocr on your documents. Four modes
-    are available:
-
-    *   ``skip``: Paperless skips all pages and will perform ocr only on pages
-        where no text is present. This is the safest option.
-    *   ``skip_noarchive``: In addition to skip, paperless won't create an
-        archived version of your documents when it finds any text in them.
-        This is useful if you don't want to have two almost-identical versions
-        of your digital documents in the media folder. This is the fastest option.
-    *   ``redo``: Paperless will OCR all pages of your documents and attempt to
-        replace any existing text layers with new text. This will be useful for
-        documents from scanners that already performed OCR with insufficient
-        results. It will also perform OCR on purely digital documents.
-
-        This option may fail on some documents that have features that cannot
-        be removed, such as forms. In this case, the text from the document is
-        used instead.
-    *   ``force``: Paperless rasterizes your documents, converting any text
-        into images and puts the OCRed text on top. This works for all documents,
-        however, the resulting document may be significantly larger and text
-        won't appear as sharp when zoomed in.
-
-    The default is ``skip``, which only performs OCR when necessary and always
-    creates archived documents.
-
-    Read more about this in the `OCRmyPDF documentation <https://ocrmypdf.readthedocs.io/en/latest/advanced.html#when-ocr-is-skipped>`_.
-
-PAPERLESS_OCR_CLEAN=<mode>
-    Tells paperless to use ``unpaper`` to clean any input document before
-    sending it to tesseract. This uses more resources, but generally results
-    in better OCR results. The following modes are available:
-
-    *   ``clean``: Apply unpaper.
-    *   ``clean-final``: Apply unpaper, and use the cleaned images to build the
-        output file instead of the original images.
-    *   ``none``: Do not apply unpaper.
-
-    Defaults to ``clean``.
-
-    .. note::
-
-        ``clean-final`` is incompatible with ocr mode ``redo``. When both
-        ``clean-final`` and the ocr mode ``redo`` is configured, ``clean``
-        is used instead.
-
-PAPERLESS_OCR_DESKEW=<bool>
-    Tells paperless to correct skewing (slight rotation of input images mainly
-    due to improper scanning)
-
-    Defaults to ``true``, which enables this feature.
-
-    .. note::
-
-        Deskewing is incompatible with ocr mode ``redo``. Deskewing will get
-        disabled automatically if ``redo`` is used as the ocr mode.
-
-PAPERLESS_OCR_ROTATE_PAGES=<bool>
-    Tells paperless to correct page rotation (90°, 180° and 270° rotation).
-
-    If you notice that paperless is not rotating incorrectly rotated
-    pages (or vice versa), try adjusting the threshold up or down (see below).
-
-    Defaults to ``true``, which enables this feature.
-
-
-PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD=<num>
-    Adjust the threshold for automatic page rotation by ``PAPERLESS_OCR_ROTATE_PAGES``.
-    This is an arbitrary value reported by tesseract. "15" is a very conservative value,
-    whereas "2" is a very aggressive option and will often result in correctly rotated pages
-    being rotated as well.
-
-    Defaults to "12".
-
-PAPERLESS_OCR_OUTPUT_TYPE=<type>
-    Specify the the type of PDF documents that paperless should produce.
-
-    *   ``pdf``: Modify the PDF document as little as possible.
-    *   ``pdfa``: Convert PDF documents into PDF/A-2b documents, which is a
-        subset of the entire PDF specification and meant for storing
-        documents long term.
-    *   ``pdfa-1``, ``pdfa-2``, ``pdfa-3`` to specify the exact version of
-        PDF/A you wish to use.
-
-    If not specified, ``pdfa`` is used. Remember that paperless also keeps
-    the original input file as well as the archived version.
-
-
-PAPERLESS_OCR_PAGES=<num>
-    Tells paperless to use only the specified amount of pages for OCR. Documents
-    with less than the specified amount of pages get OCR'ed completely.
-
-    Specifying 1 here will only use the first page.
-
-    When combined with ``PAPERLESS_OCR_MODE=redo`` or ``PAPERLESS_OCR_MODE=force``,
-    paperless will not modify any text it finds on excluded pages and copy it
-    verbatim.
-
-    Defaults to 0, which disables this feature and always uses all pages.
-
-PAPERLESS_OCR_IMAGE_DPI=<num>
-    Paperless will OCR any images you put into the system and convert them
-    into PDF documents. This is useful if your scanner produces images.
-    In order to do so, paperless needs to know the DPI of the image.
-    Most images from scanners will have this information embedded and
-    paperless will detect and use that information. In case this fails, it
-    uses this value as a fallback.
-
-    Set this to the DPI your scanner produces images at.
-
-    Default is none, which will automatically calculate image DPI so that
-    the produced PDF documents are A4 sized.
-
-
-PAPERLESS_OCR_USER_ARGS=<json>
-    OCRmyPDF offers many more options. Use this parameter to specify any
-    additional arguments you wish to pass to OCRmyPDF. Since Paperless uses
-    the API of OCRmyPDF, you have to specify these in a format that can be
-    passed to the API. See `the API reference of OCRmyPDF <https://ocrmypdf.readthedocs.io/en/latest/api.html#reference>`_
-    for valid parameters. All command line options are supported, but they
-    use underscores instead of dashes.
-
-    .. caution::
-
-        Paperless has been tested to work with the OCR options provided
-        above. There are many options that are incompatible with each other,
-        so specifying invalid options may prevent paperless from consuming
-        any documents.
-
-    Specify arguments as a JSON dictionary. Keep note of lower case booleans
-    and double quoted parameter names and strings. Examples:
-
-    .. code:: json
-
-        {"deskew": true, "optimize": 3, "unpaper_args": "--pre-rotate 90"}
-
-.. _configuration-tika:
-
-Tika settings
-#############
-
-Paperless can make use of `Tika <https://tika.apache.org/>`_ and
-`Gotenberg <https://gotenberg.dev/>`_ for parsing and
-converting "Office" documents (such as ".doc", ".xlsx" and ".odt"). If you
-wish to use this, you must provide a Tika server and a Gotenberg server,
-configure their endpoints, and enable the feature.
-
-PAPERLESS_TIKA_ENABLED=<bool>
-    Enable (or disable) the Tika parser.
-
-    Defaults to false.
-
-PAPERLESS_TIKA_ENDPOINT=<url>
-    Set the endpoint URL were Paperless can reach your Tika server.
-
-    Defaults to "http://localhost:9998".
-
-PAPERLESS_TIKA_GOTENBERG_ENDPOINT=<url>
-    Set the endpoint URL were Paperless can reach your Gotenberg server.
-
-    Defaults to "http://localhost:3000".
-
-If you run paperless on docker, you can add those services to the docker-compose
-file (see the provided ``docker-compose.tika.yml`` file for reference). The changes
-requires are as follows:
-
-.. code:: yaml
-
-    services:
-        # ...
-
-        webserver:
-            # ...
-
-            environment:
-                # ...
-
-                PAPERLESS_TIKA_ENABLED: 1
-                PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
-                PAPERLESS_TIKA_ENDPOINT: http://tika:9998
-
-        # ...
-
-        gotenberg:
-            image: gotenberg/gotenberg:7
-            restart: unless-stopped
-            environment:
-                CHROMIUM_DISABLE_ROUTES: 1
-
-        tika:
-            image: apache/tika
-            restart: unless-stopped
-
-Add the configuration variables to the environment of the webserver (alternatively
-put the configuration in the ``docker-compose.env`` file) and add the additional
-services below the webserver service. Watch out for indentation.
 
 Software tweaks
 ###############
@@ -465,48 +150,31 @@ PAPERLESS_TASK_WORKERS=<num>
     maintain the automatic matching algorithm, check emails, consume documents,
     etc. This variable specifies how many things it will do in parallel.
 
-
 PAPERLESS_THREADS_PER_WORKER=<num>
     Furthermore, paperless uses multiple threads when consuming documents to
     speed up OCR. This variable specifies how many pages paperless will process
     in parallel on a single document.
 
     .. caution::
-
+        
         Ensure that the product
-
+        
             PAPERLESS_TASK_WORKERS * PAPERLESS_THREADS_PER_WORKER
-
+        
         does not exceed your CPU core count or else paperless will be extremely slow.
         If you want paperless to process many documents in parallel, choose a high
         worker count. If you want paperless to process very large documents faster,
         use a higher thread per worker count.
 
     The default is a balance between the two, according to your CPU core count,
-    with a slight favor towards threads per worker:
-
-    +----------------+---------+---------+
-    | CPU core count | Workers | Threads |
-    +----------------+---------+---------+
-    |              1 |       1 |       1 |
-    +----------------+---------+---------+
-    |              2 |       2 |       1 |
-    +----------------+---------+---------+
-    |              4 |       2 |       2 |
-    +----------------+---------+---------+
-    |              6 |       2 |       3 |
-    +----------------+---------+---------+
-    |              8 |       2 |       4 |
-    +----------------+---------+---------+
-    |             12 |       3 |       4 |
-    +----------------+---------+---------+
-    |             16 |       4 |       4 |
-    +----------------+---------+---------+
+    with a slight favor towards threads per worker, and using as much cores as
+    possible.
 
     If you only specify PAPERLESS_TASK_WORKERS, paperless will adjust
     PAPERLESS_THREADS_PER_WORKER automatically.
 
 
+
 PAPERLESS_TIME_ZONE=<timezone>
     Set the time zone here.
     See https://docs.djangoproject.com/en/3.1/ref/settings/#std:setting-TIME_ZONE
@@ -515,17 +183,44 @@ PAPERLESS_TIME_ZONE=<timezone>
     Defaults to UTC.
 
 
-.. _configuration-polling:
+
+PAPERLESS_OCR_PAGES=<num>
+    Tells paperless to use only the specified amount of pages for OCR. Documents
+    with less than the specified amount of pages get OCR'ed completely.
+
+    Specifying 1 here will only use the first page.
+
+    Defaults to 0, which disables this feature and always uses all pages.
+
+
+
+PAPERLESS_OCR_LANGUAGE=<lang>
+    Customize the default language that tesseract will attempt to use when
+    parsing documents. The default language is used whenever
+    
+    * No language could be detected on a document
+    * No tesseract data files are available for the detected language
+    
+    It should be a 3-letter language code consistent with ISO
+    639: https://www.loc.gov/standards/iso639-2/php/code_list.php
+
+    Set this to the language most of your documents are written in.
+
+    Defaults to "eng".
+
+PAPERLESS_OCR_ALWAYS=<bool>
+    By default Paperless does not OCR a document if the text can be retrieved from
+    the document directly. Set to true to always OCR documents.
+
+    Defaults to false.
 
 PAPERLESS_CONSUMER_POLLING=<num>
     If paperless won't find documents added to your consume folder, it might
     not be able to automatically detect filesystem changes. In that case,
     specify a polling interval in seconds here, which will then cause paperless
-    to periodically check your consumption directory for changes. This will also
-    disable listening for file system changes with ``inotify``.
-
-    Defaults to 0, which disables polling and uses filesystem notifications.
+    to periodically check your consumption directory for changes.
 
+    Defaults to 0, which disables polling and uses filesystem notifiactions.
 
 PAPERLESS_CONSUMER_DELETE_DUPLICATES=<bool>
     When the consumer detects a duplicate document, it will not touch the
@@ -533,35 +228,13 @@ PAPERLESS_CONSUMER_DELETE_DUPLICATES=<bool>
 
     Defaults to false.
 
-
-PAPERLESS_CONSUMER_RECURSIVE=<bool>
-    Enable recursive watching of the consumption directory. Paperless will
-    then pickup files from files in subdirectories within your consumption
-    directory as well.
-
-    Defaults to false.
-
-
-PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS=<bool>
-    Set the names of subdirectories as tags for consumed files.
-    E.g. <CONSUMPTION_DIR>/foo/bar/file.pdf will add the tags "foo" and "bar" to
-    the consumed file. Paperless will create any tags that don't exist yet.
-
-    This is useful for sorting documents with certain tags such as ``car`` or
-    ``todo`` prior to consumption. These folders won't be deleted.
-
-    PAPERLESS_CONSUMER_RECURSIVE must be enabled for this to work.
-
-    Defaults to false.
-
-
 PAPERLESS_CONVERT_MEMORY_LIMIT=<num>
     On smaller systems, or even in the case of Very Large Documents, the consumer
     may explode, complaining about how it's "unable to extend pixel cache".  In
     such cases, try setting this to a reasonably low value, like 32.  The
     default is to use whatever is necessary to do everything without writing to
     disk, and units are in megabytes.
-
+    
     For more information on how to use this value, you should search
     the web for "MAGICK_MEMORY_LIMIT".
 
@@ -572,14 +245,26 @@ PAPERLESS_CONVERT_TMPDIR=<path>
     /tmp as tmpfs, you should set this to a path that's on a physical disk, like
     /home/your_user/tmp or something.  ImageMagick will use this as scratch space
     when crunching through very large documents.
-
+    
     For more information on how to use this value, you should search
     the web for "MAGICK_TMPDIR".
 
     Default is none, which disables the temporary directory.
 
+PAPERLESS_CONVERT_DENSITY=<num>
+    This setting has a high impact on the physical size of tmp page files,
+    the speed of document conversion, and can affect the accuracy of OCR
+    results. Individual results can vary and this setting should be tested
+    thoroughly against the documents you are importing to see if it has any
+    impacts either negative or positive.
+    Testing on limited document sets has shown a setting of 200 can cut the
+    size of tmp files by 1/3, and speed up conversion by up to 4x
+    with little impact to OCR accuracy.
+
+    Default is 300.
+
 PAPERLESS_OPTIMIZE_THUMBNAILS=<bool>
-    Use optipng to optimize thumbnails. This usually reduces the size of
+    Use optipng to optimize thumbnails. This usually reduces the sice of
     thumbnails by about 20%, but uses considerable compute time during
     consumption.
 
@@ -597,47 +282,16 @@ PAPERLESS_FILENAME_DATE_ORDER=<format>
     Use this setting to enable checking the document filename for date
     information. The date order can be set to any option as specified in
     https://dateparser.readthedocs.io/en/latest/settings.html#date-order.
-    The filename will be checked first, and if nothing is found, the document
+    The filename will be checked first, and if nothing is found, the document 
     text will be checked as normal.
 
     Defaults to none, which disables this feature.
 
-PAPERLESS_THUMBNAIL_FONT_NAME=<filename>
-    Paperless creates thumbnails for plain text files by rendering the content
-    of the file on an image and uses a predefined font for that. This
-    font can be changed here.
+PAPERLESS_FILENAME_PARSE_TRANSFORMS
+    Transforms filenames before they are processed by paperless. See
+    :ref:`advanced-transforming_filenames` for details.
 
-    Note that this won't have any effect on already generated thumbnails.
-
-    Defaults to ``/usr/share/fonts/liberation/LiberationSerif-Regular.ttf``.
-
-PAPERLESS_IGNORE_DATES=<string>
-    Paperless parses a documents creation date from filename and file content.
-    You may specify a comma separated list of dates that should be ignored during
-    this process. This is useful for special dates (like date of birth) that appear
-    in documents regularly but are very unlikely to be the documents creation date.
-
-    You may specify dates in a multitude of formats supported by dateparser (see
-    https://dateparser.readthedocs.io/en/latest/#popular-formats) but as the dates
-    need to be comma separated, the options are limited.
-    Example: "2020-12-02,22.04.1999"
-
-    Defaults to an empty string to not ignore any dates.
-
-PAPERLESS_DATE_ORDER=<format>
-    Paperless will try to determine the document creation date from its contents.
-    Specify the date format Paperless should expect to see within your documents.
-
-    This option defaults to DMY which translates to day first, month second, and year
-    last order. Characters D, M, or Y can be shuffled to meet the required order.
-
-PAPERLESS_CONSUMER_IGNORE_PATTERNS=<json>
-    By default, paperless ignores certain files and folders in the consumption
-    directory, such as system files created by the Mac OS.
-
-    This can be adjusted by configuring a custom json array with patterns to exclude.
-
-    Defautls to ``[".DS_STORE/*", "._*", ".stfolder/*"]``.
+    Defaults to none, which disables this feature.
 
 Binaries
 ########
@@ -655,67 +309,8 @@ PAPERLESS_CONVERT_BINARY=<path>
 PAPERLESS_GS_BINARY=<path>
     Defaults to "/usr/bin/gs".
 
+PAPERLESS_UNPAPER_BINARY=<path>
+    Defaults to "/usr/bin/unpaper".
+
 PAPERLESS_OPTIPNG_BINARY=<path>
     Defaults to "/usr/bin/optipng".
-
-
-.. _configuration-docker:
-
-Docker-specific options
-#######################
-
-These options don't have any effect in ``paperless.conf``. These options adjust
-the behavior of the docker container. Configure these in `docker-compose.env`.
-
-PAPERLESS_WEBSERVER_WORKERS=<num>
-    The number of worker processes the webserver should spawn. More worker processes
-    usually result in the front end to load data much quicker. However, each worker process
-    also loads the entire application into memory separately, so increasing this value
-    will increase RAM usage.
-
-    Consider configuring this to 1 on low power devices with limited amount of RAM.
-
-    Defaults to 2.
-
-USERMAP_UID=<uid>
-    The ID of the paperless user in the container. Set this to your actual user ID on the
-    host system, which you can get by executing
-
-    .. code:: shell-session
-
-        $ id -u
-
-    Paperless will change ownership on its folders to this user, so you need to get this right
-    in order to be able to write to the consumption directory.
-
-    Defaults to 1000.
-
-USERMAP_GID=<gid>
-    The ID of the paperless Group in the container. Set this to your actual group ID on the
-    host system, which you can get by executing
-
-    .. code:: shell-session
-
-        $ id -g
-
-    Paperless will change ownership on its folders to this group, so you need to get this right
-    in order to be able to write to the consumption directory.
-
-    Defaults to 1000.
-
-PAPERLESS_OCR_LANGUAGES=<list>
-    Additional OCR languages to install. By default, paperless comes with
-    English, German, Italian, Spanish and French. If your language is not in this list, install
-    additional languages with this configuration option:
-
-    .. code:: bash
-
-        PAPERLESS_OCR_LANGUAGES=tur ces
-
-    To actually use these languages, also set the default OCR language of paperless:
-
-    .. code:: bash
-
-        PAPERLESS_OCR_LANGUAGE=tur
-
-    Defaults to none, which does not install any additional languages.

docs/contributing.rst

@@ -6,7 +6,7 @@ Contributing to Paperless
 .. warning::
 
     This section is not updated to paperless-ng yet.
-
+    
 Maybe you've been using Paperless for a while and want to add a feature or two,
 or maybe you've come across a bug that you have some ideas how to solve.  The
 beauty of Free software is that you can see what's wrong and help to get it
@@ -85,7 +85,7 @@ quoted, or triple-quoted string will do:
     problematic_string = 'This is a "string" with "quotes" in it'
 
 In HTML templates, please use double-quotes for tag attributes, and single
-quotes for arguments passed to Django template tags:
+quotes for arguments passed to Django tempalte tags:
 
 .. code:: html
 

docs/extending.rst

@@ -1,368 +1,116 @@
 .. _extending:
 
-Paperless development
-#####################
-
-This section describes the steps you need to take to start development on paperless-ng.
-
-Check out the source from github. The repository is organized in the following way:
-
-*   ``master`` always represents the latest release and will only see changes
-    when a new release is made.
-*   ``dev`` contains the code that will be in the next release.
-*   ``feature-X`` contain bigger changes that will be in some release, but not
-    necessarily the next one.
-
-When making functional changes to paperless, *always* make your changes on the ``dev`` branch.
-
-Apart from that, the folder structure is as follows:
-
-*   ``docs/`` - Documentation.
-*   ``src-ui/`` - Code of the front end.
-*   ``src/`` - Code of the back end.
-*   ``scripts/`` - Various scripts that help with different parts of development.
-*   ``docker/`` - Files required to build the docker image.
-
-Initial setup and first start
-=============================
-
-After you forked and cloned the code from github you need to perform a first-time setup.
-To do the setup you need to perform the steps from the following chapters in a certain order:
-
-1.  Install prerequisites + pipenv as mentioned in :ref:`Bare metal route <setup-bare_metal>`
-2.  Copy ``paperless.conf.example`` to ``paperless.conf`` and enable debug mode.
-3.  Install the Angular CLI interface:
-
-    .. code:: shell-session
-
-        $ npm install -g @angular/cli
-
-4.  Create ``consume`` and ``media`` folders in the cloned root folder.
-
-    .. code:: shell-session
-
-        mkdir -p consume media
-
-5.  You can now either ...
-
-    *  install redis or
-    *  use the included scripts/start-services.sh to use docker to fire up a redis instance (and some other services such as tika, gotenberg and a postgresql server) or
-    *  spin up a bare redis container
-
-        .. code:: shell-session
-
-            docker run -d -p 6379:6379 -restart unless-stopped redis:latest
-
-6.  Install the python dependencies by performing in the src/ directory.
-
-    .. code:: shell-session
-
-        pipenv install --dev
-
-7.  Generate the static UI so you can perform a login to get session that is required for frontend development (this needs to be done one time only). From root folder:
-
-    .. code:: shell-session
-
-        compile-frontend.sh
-
-8.  Apply migrations and create a superuser for your dev instance:
-
-    .. code:: shell-session
-
-        python3 manage.py migrate
-        python3 manage.py createsuperuser
-
-9.  Now spin up the dev backend. Depending on which part of paperless you're developing for, you need to have some or all of them running.
-
-    .. code:: shell-session
-
-        python3 manage.py runserver & python3 manage.py document_consumer & python3 manage.py qcluster
-
-10. Login with the superuser credentials provided in step 8 at ``http://localhost:8000`` to create a session that enables you to use the backend.
-
-Backend development environment is now ready, to start Frontend development go to ``/src-ui`` and run ``ng serve``. From there you can use ``http://localhost:4200`` for a preview.
-
-Back end development
-====================
-
-The backend is a django application. I use PyCharm for development, but you can use whatever
-you want.
-
-Configure the IDE to use the src/ folder as the base source folder. Configure the following
-launch configurations in your IDE:
-
-*   python3 manage.py runserver
-*   python3 manage.py qcluster
-*   python3 manage.py document_consumer
-
-To start them all:
-
-.. code:: shell-session
-
-    python3 manage.py runserver & python3 manage.py document_consumer & python3 manage.py qcluster
-
-Testing and code style:
-
-*   Run ``pytest`` in the src/ directory to execute all tests. This also generates a HTML coverage
-    report. When runnings test, paperless.conf is loaded as well. However: the tests rely on the default
-    configuration. This is not ideal. But for now, make sure no settings except for DEBUG are overridden when testing.
-*   Run ``pycodestyle`` to test your code for issues with the configured code style settings.
-
-    .. note::
-
-        The line length rule E501 is generally useful for getting multiple source files
-        next to each other on the screen. However, in some cases, its just not possible
-        to make some lines fit, especially complicated IF cases. Append ``# NOQA: E501``
-        to disable this check for certain lines.
-
-Front end development
-=====================
-
-The front end is build using angular. I use the ``Code - OSS`` IDE for development.
-
-In order to get started, you need ``npm``. Install the Angular CLI interface with
-
-.. code:: shell-session
-
-    $ npm install -g @angular/cli
-
-and make sure that it's on your path. Next, in the src-ui/ directory, install the
-required dependencies of the project.
-
-.. code:: shell-session
-
-    $ npm install
-
-You can launch a development server by running
-
-.. code:: shell-session
-
-    $ ng serve
-
-This will automatically update whenever you save. However, in-place compilation might fail
-on syntax errors, in which case you need to restart it.
-
-By default, the development server is available on ``http://localhost:4200/`` and is configured
-to access the API at ``http://localhost:8000/api/``, which is the default of the backend.
-If you enabled DEBUG on the back end, several security overrides for allowed hosts, CORS and
-X-Frame-Options are in place so that the front end behaves exactly as in production. This also
-relies on you being logged into the back end. Without a valid session, The front end will simply
-not work.
-
-In order to build the front end and serve it as part of django, execute
-
-.. code:: shell-session
-
-    $ ng build --prod
-
-This will build the front end and put it in a location from which the Django server will serve
-it as static content. This way, you can verify that authentication is working.
-
-
-Localization
-============
-
-Paperless is available in many different languages. Since paperless consists both of a django
-application and an Angular front end, both these parts have to be translated separately.
-
-Front end localization
-----------------------
-
-*   The Angular front end does localization according to the `Angular documentation <https://angular.io/guide/i18n>`_.
-*   The source language of the project is "en_US".
-*   The source strings end up in the file "src-ui/messages.xlf".
-*   The translated strings need to be placed in the "src-ui/src/locale/" folder.
-*   In order to extract added or changed strings from the source files, call ``ng xi18n --ivy``.
-
-Adding new languages requires adding the translated files in the "src-ui/src/locale/" folder and adjusting a couple files.
-
-1.  Adjust "src-ui/angular.json":
-
-    .. code:: json
-
-        "i18n": {
-            "sourceLocale": "en-US",
-            "locales": {
-                "de": "src/locale/messages.de.xlf",
-                "nl-NL": "src/locale/messages.nl_NL.xlf",
-                "fr": "src/locale/messages.fr.xlf",
-                "en-GB": "src/locale/messages.en_GB.xlf",
-                "pt-BR": "src/locale/messages.pt_BR.xlf",
-                "language-code": "language-file"
-            }
-        }
-
-2.  Add the language to the available options in "src-ui/src/app/services/settings.service.ts":
-
-    .. code:: typescript
-
-        getLanguageOptions(): LanguageOption[] {
-            return [
-                {code: "en-us", name: $localize`English (US)`, englishName: "English (US)", dateInputFormat: "mm/dd/yyyy"},
-                {code: "en-gb", name: $localize`English (GB)`, englishName: "English (GB)", dateInputFormat: "dd/mm/yyyy"},
-                {code: "de", name: $localize`German`, englishName: "German", dateInputFormat: "dd.mm.yyyy"},
-                {code: "nl", name: $localize`Dutch`, englishName: "Dutch", dateInputFormat: "dd-mm-yyyy"},
-                {code: "fr", name: $localize`French`, englishName: "French", dateInputFormat: "dd/mm/yyyy"},
-                {code: "pt-br", name: $localize`Portuguese (Brazil)`, englishName: "Portuguese (Brazil)", dateInputFormat: "dd/mm/yyyy"}
-                // Add your new language here
-            ]
-        }
-
-    ``dateInputFormat`` is a special string that defines the behavior of the date input fields and absolutely needs to contain "dd", "mm" and "yyyy".
-
-3.  Import and register the Angular data for this locale in "src-ui/src/app/app.module.ts":
-
-    .. code:: typescript
-
-        import localeDe from '@angular/common/locales/de';
-        registerLocaleData(localeDe)
-
-Back end localization
----------------------
-
-A majority of the strings that appear in the back end appear only when the admin is used. However,
-some of these are still shown on the front end (such as error messages).
-
-*   The django application does localization according to the `django documentation <https://docs.djangoproject.com/en/3.1/topics/i18n/translation/>`_.
-*   The source language of the project is "en_US".
-*   Localization files end up in the folder "src/locale/".
-*   In order to extract strings from the application, call ``python3 manage.py makemessages -l en_US``. This is important after making changes to translatable strings.
-*   The message files need to be compiled for them to show up in the application. Call ``python3 manage.py compilemessages`` to do this. The generated files don't get
-    committed into git, since these are derived artifacts. The build pipeline takes care of executing this command.
-
-Adding new languages requires adding the translated files in the "src/locale/" folder and adjusting the file "src/paperless/settings.py" to include the new language:
-
-.. code:: python
-
-    LANGUAGES = [
-        ("en-us", _("English (US)")),
-        ("en-gb", _("English (GB)")),
-        ("de", _("German")),
-        ("nl-nl", _("Dutch")),
-        ("fr", _("French")),
-        ("pt-br", _("Portuguese (Brazil)")),
-        # Add language here.
-    ]
-
-
-Building the documentation
-==========================
-
-The documentation is built using sphinx. I've configured ReadTheDocs to automatically build
-the documentation when changes are pushed. If you want to build the documentation locally,
-this is how you do it:
-
-1.  Install python dependencies.
-
-    .. code:: shell-session
-
-        $ cd /path/to/paperless
-        $ pipenv install --dev
-
-2.  Build the documentation
-
-    .. code:: shell-session
-
-        $ cd /path/to/paperless/docs
-        $ pipenv run make clean html
-
-This will build the HTML documentation, and put the resulting files in the ``_build/html``
-directory.
-
-Building the Docker image
-=========================
-
-Building the docker image from source requires the following two steps:
-
-1.  Build the front end.
-
-    .. code:: shell-session
-
-        ./compile-frontend.sh
-
-2.  Build the docker image.
-
-    .. code:: shell-session
-
-        docker build . -t <your-tag>
-
 Extending Paperless
 ===================
 
-Paperless does not have any fancy plugin systems and will probably never have. However,
-some parts of the application have been designed to allow easy integration of additional
-features without any modification to the base code.
+.. warning::
 
-Making custom parsers
----------------------
+    This section is not updated to paperless-ng yet.
 
-Paperless uses parsers to add documents to paperless. A parser is responsible for:
+For the most part, Paperless is monolithic, so extending it is often best
+managed by way of modifying the code directly and issuing a pull request on
+`GitHub`_.  However, over time the project has been evolving to be a little
+more "pluggable" so that users can write their own stuff that talks to it.
 
-*   Retrieve the content from the original
-*   Create a thumbnail
-*   Optional: Retrieve a created date from the original
-*   Optional: Create an archived document from the original
+.. _GitHub: https://github.com/the-paperless-project/paperless
 
-Custom parsers can be added to paperless to support more file types. In order to do that,
-you need to write the parser itself and announce its existence to paperless.
 
-The parser itself must extend ``documents.parsers.DocumentParser`` and must implement the
-methods ``parse`` and ``get_thumbnail``. You can provide your own implementation to
-``get_date`` if you don't want to rely on paperless' default date guessing mechanisms.
+.. _extending-parsers:
+
+Parsers
+-------
+
+You can leverage Paperless' consumption model to have it consume files *other*
+than ones handled by default like ``.pdf``, ``.jpg``, and ``.tiff``.  To do so,
+you simply follow Django's convention of creating a new app, with a few key
+requirements.
+
+
+.. _extending-parsers-parserspy:
+
+parsers.py
+..........
+
+In this file, you create a class that extends
+``documents.parsers.DocumentParser`` and go about implementing the three
+required methods:
+
+* ``get_thumbnail()``: Returns the path to a file we can use as a thumbnail for
+  this document.
+* ``get_text()``: Returns the text from the document and only the text.
+* ``get_date()``: If possible, this returns the date of the document, otherwise
+  it should return ``None``.
+
+
+.. _extending-parsers-signalspy:
+
+signals.py
+..........
+
+At consumption time, Paperless emits a ``document_consumer_declaration``
+signal which your module has to react to in order to let the consumer know
+whether or not it's capable of handling a particular file.  Think of it like
+this:
+
+1. Consumer finds a file in the consumption directory.
+2. It asks all the available parsers: *"Hey, can you handle this file?"*
+3. Each parser responds with either ``None`` meaning they can't handle the
+   file, or a dictionary in the following format:
 
 .. code:: python
 
-    class MyCustomParser(DocumentParser):
+    {
+        "parser": <the class name>,
+        "weight": <an integer>
+    }
 
-        def parse(self, document_path, mime_type):
-            # This method does not return anything. Rather, you should assign
-            # whatever you got from the document to the following fields:
+The consumer compares the ``weight`` values from all respondents and uses the
+class with the highest value to consume the document.  The default parser,
+``RasterisedDocumentParser`` has a weight of ``0``.
 
-            # The content of the document.
-            self.text = "content"
 
-            # Optional: path to a PDF document that you created from the original.
-            self.archive_path = os.path.join(self.tempdir, "archived.pdf")
+.. _extending-parsers-appspy:
 
-            # Optional: "created" date of the document.
-            self.date = get_created_from_metadata(document_path)
+apps.py
+.......
 
-        def get_thumbnail(self, document_path, mime_type):
-            # This should return the path to a thumbnail you created for this
-            # document.
-            return os.path.join(self.tempdir, "thumb.png")
+This is a standard Django file, but you'll need to add some code to it to
+connect your parser to the ``document_consumer_declaration`` signal.
 
-If you encounter any issues during parsing, raise a ``documents.parsers.ParseError``.
 
-The ``self.tempdir`` directory is a temporary directory that is guaranteed to be empty
-and removed after consumption finished. You can use that directory to store any
-intermediate files and also use it to store the thumbnail / archived document.
+.. _extending-parsers-finally:
 
-After that, you need to announce your parser to paperless. You need to connect a
-handler to the ``document_consumer_declaration`` signal. Have a look in the file
-``src/paperless_tesseract/apps.py`` on how that's done. The handler is a method
-that returns information about your parser:
+Finally
+.......
+
+The last step is to update ``settings.py`` to include your new module.
+Eventually, this will be dynamic, but at the moment, you have to edit the
+``INSTALLED_APPS`` section manually.  Simply add the path to your AppConfig to
+the list like this:
 
 .. code:: python
 
-    def myparser_consumer_declaration(sender, **kwargs):
-        return {
-            "parser": MyCustomParser,
-            "weight": 0,
-            "mime_types": {
-                "application/pdf": ".pdf",
-                "image/jpeg": ".jpg",
-            }
-        }
+    INSTALLED_APPS = [
+        ...
+        "my_module.apps.MyModuleConfig",
+        ...
+    ]
 
-*   ``parser`` is a reference to a class that extends ``DocumentParser``.
+Order doesn't matter, but generally it's a good idea to place your module lower
+in the list so that you don't end up accidentally overriding project defaults
+somewhere.
 
-*   ``weight`` is used whenever two or more parsers are able to parse a file: The parser with
-    the higher weight wins. This can be used to override the parsers provided by
-    paperless.
 
-*   ``mime_types`` is a dictionary. The keys are the mime types your parser supports and the value
-    is the default file extension that paperless should use when storing files and serving them for
-    download. We could guess that from the file extensions, but some mime types have many extensions
-    associated with them and the python methods responsible for guessing the extension do not always
-    return the same value.
+.. _extending-parsers-example:
+
+An Example
+..........
+
+The core Paperless functionality is based on this design, so if you want to see
+what a parser module should look like, have a look at `parsers.py`_,
+`signals.py`_, and `apps.py`_ in the `paperless_tesseract`_ module.
+
+.. _parsers.py: https://github.com/the-paperless-project/paperless/blob/master/src/paperless_tesseract/parsers.py
+.. _signals.py: https://github.com/the-paperless-project/paperless/blob/master/src/paperless_tesseract/signals.py
+.. _apps.py: https://github.com/the-paperless-project/paperless/blob/master/src/paperless_tesseract/apps.py
+.. _paperless_tesseract: https://github.com/the-paperless-project/paperless/blob/master/src/paperless_tesseract/

docs/faq.rst

@@ -3,18 +3,6 @@
 Frequently asked questions
 **************************
 
-**Q:** *What's the general plan for Paperless-ng?*
-
-**A:** Paperless-ng is already almost feature-complete. This project will remain
-as simple as it is right now. It will see improvements to features that are already there.
-If you need advanced features such as document versions,
-workflows or multi-user with customizable access to individual files, this is
-not the tool for you.
-
-Features that *are* planned are some more quality of life extensions for the searching
-(i.e., search for similar documents, group results by correspondents with "more from this"
-links, etc), bulk editing and hierarchical tags.
-
 **Q:** *I'm using docker. Where are my documents?*
 
 **A:** Your documents are stored inside the docker volume ``paperless_media``.
@@ -29,31 +17,17 @@ is
 
 .. caution::
 
-    Do not mess with this folder. Don't change permissions and don't move
+    Dont mess with this folder. Don't change permissions and don't move
     files around manually. This folder is meant to be entirely managed by docker
     and paperless.
 
-**Q:** *Let's say you don't support this project anymore in a year. Can I easily move to other systems?*
-
-**A:** Your documents are stored as plain files inside the media folder. You can always drag those files
-out of that folder to use them elsewhere. Here are a couple notes about that.
-
-*   Paperless never modifies your original documents. It keeps checksums of all documents and uses a
-    scheduled sanity checker to check that they remain the same.
-*   By default, paperless uses the internal ID of each document as its filename. This might not be very
-    convenient for export. However, you can adjust the way files are stored in paperless by
-    :ref:`configuring the filename format <advanced-file_name_handling>`.
-*   :ref:`The exporter <utilities-exporter>` is another easy way to get your files out of paperless with reasonable file names.
-
 **Q:** *What file types does paperless-ng support?*
 
 **A:** Currently, the following files are supported:
 
-*   PDF documents, PNG images, JPEG images, TIFF images and GIF images are processed with OCR and converted into PDF documents.
+*   PDF documents, PNG images and JPEG images are processed with OCR.
 *   Plain text documents are supported as well and are added verbatim
     to paperless.
-*   With the optional Tika integration enabled (see :ref:`Configuration <configuration-tika>`), Paperless also supports various
-    Office documents (.docx, .doc, odt, .ppt, .pptx, .odp, .xls, .xlsx, .ods).
 
 Paperless determines the type of a file by inspecting its content. The
 file extensions do not matter.
@@ -62,61 +36,33 @@ file extensions do not matter.
 
 **A:** The short answer is yes. I've tested it on a Raspberry Pi 3 B.
 The long answer is that certain parts of
-Paperless will run very slow, such as the OCR. On Raspberry Pi,
+Paperless will run very slow, such as the tesseract OCR. On Rasperry Pi,
 try to OCR documents before feeding them into paperless so that paperless can
-reuse the text. The web interface is a lot snappier, since it runs
+reuse the text. The web interface should be alot snappier, since it runs
 in your browser and paperless has to do much less work to serve the data.
 
 .. note::
+    
+    Consider setting ``PAPERLESS_OPTIMIZE_THUMBNAILS`` to false to speed up
+    the consumption process. This takes quite a bit of time on Raspberry Pi.
 
-    You can adjust some of the settings so that paperless uses less processing
-    power. See :ref:`setup-less_powerful_devices` for details.
+.. note::
+    
+    Updating the :ref:`automatic matching algorithm <advanced-automatic_matching>`
+    takes quite a bit of time. However, the update mechanism checks if your
+    data has changed before doing the heavy lifting. If you experience the 
+    algorithm taking too much cpu time, consider changing the schedule in the
+    admin interface to daily or weekly. You can also manually invoke the task
+    by changing the date and time of the next run to today/now.
 
+    The actual matching of the algorithm is fast and works on Raspberry Pi as 
+    well as on any other device.
+
+    
 
 **Q:** *How do I install paperless-ng on Raspberry Pi?*
 
-**A:** Docker images are available for arm and arm64 hardware, so just follow
-the docker-compose instructions. Apart from more required disk space compared to
-a bare metal installation, docker comes with close to zero overhead, even on
-Raspberry Pi.
-
-If you decide to got with the bare metal route, be aware that some of the
-python requirements do not have precompiled packages for ARM / ARM64. Installation
-of these will require additional development libraries and compilation will take
-a long time.
-
-**Q:** *How do I run this on unRaid?*
-
-**A:** Head over to `<https://github.com/selfhosters/unRAID-CA-templates>`_,
-`Uli Fahrer <https://github.com/Tooa>`_ created a container template for that.
-I don't exactly know how to use that though, since I don't use unRaid.
-
-**Q:** *How do I run this on my toaster?*
-
-**A:** I honestly don't know! As for all other devices that might be able
-to run paperless, you're a bit on your own. If you can't run the docker image,
-the documentation has instructions for bare metal installs. I'm running
-paperless on an i3 processor from 2015 or so. This is also what I use to test
-new releases with. Apart from that, I also have a Raspberry Pi, which I
-occasionally build the image on and see if it works.
-
-**Q:** *How do I proxy this with NGINX?*
-
-**A:** See :ref:`here <setup-nginx>`.
-
-.. _faq-mod_wsgi:
-
-**Q:** *How do I get WebSocket support with Apache mod_wsgi*?
-
-**A:** ``mod_wsgi`` by itself does not support ASGI. Paperless will continue
-to work with WSGI, but certain features such as status notifications about
-document consumption won't be available.
-
-If you want to continue using ``mod_wsgi``, you will have to run an ASGI-enabled
-web server as well that processes WebSocket connections, and configure Apache to
-redirect WebSocket connections to this server. Multiple options for ASGI servers
-exist:
-
-* ``gunicorn`` with ``uvicorn`` as the worker implementation (the default of paperless)
-* ``daphne`` as a standalone server, which is the reference implementation for ASGI.
-* ``uvicorn`` as a standalone server
+**A:** There is not docker image for ARM available. If you know how to build
+that automatically, I'm all ears. For now, you have to grab the latest release
+archive from the project page and build the image yourself. The release comes
+with the front end already compiled, so you don't have to do this on the Pi.

docs/index.rst

@@ -42,14 +42,11 @@ resources in the documentation:
     learn about how paperless automates all tagging using machine learning.
 *   Paperless now comes with a :ref:`proper email consumer <usage-email>`
     that's fully tested and production ready.
-*   Paperless creates searchable PDF/A documents from whatever you you put into
-    the consumption directory. This means that you can select text in
-    image-only documents coming from your scanner.
 *   See :ref:`this note <utilities-encyption>` about GnuPG encryption in
     paperless-ng.
 *   Paperless is now integrated with a
     :ref:`task processing queue <setup-task_processor>` that tells you
-    at a glance when and why something is not working.
+    at a glance when and why something is not working. 
 *   The :ref:`changelog <paperless_changelog>` contains a detailed list of all changes
     in paperless-ng.
 
@@ -70,8 +67,8 @@ Contents
    configuration
    api
    faq
-   troubleshooting
    extending
+   troubleshooting
    contributing
    scanners
    screenshots

docs/scanners.rst

@@ -8,93 +8,36 @@ Scanner recommendations
 As Paperless operates by watching a folder for new files, doesn't care what
 scanner you use, but sometimes finding a scanner that will write to an FTP,
 NFS, or SMB server can be difficult.  This page is here to help you find one
-that works right for you based on recommendations from other Paperless users.
+that works right for you based on recommentations from other Paperless users.
 
-Physical scanners
-=================
++---------+----------------+-----+-----+-----+----------------+
+| Brand   | Model          | Supports        | Recommended By |
++---------+----------------+-----+-----+-----+----------------+
+|         |                | FTP | NFS | SMB |                |
++=========+================+=====+=====+=====+================+
+| Brother | `ADS-1500W`_   | yes | no  | yes | `danielquinn`_ |
++---------+----------------+-----+-----+-----+----------------+
+| Brother | `MFC-J6930DW`_ | yes |     |     | `ayounggun`_   |
++---------+----------------+-----+-----+-----+----------------+
+| Brother | `MFC-J5910DW`_ | yes |     |     | `bmsleight`_   |
++---------+----------------+-----+-----+-----+----------------+
+| Brother | `MFC-9142CDN`_ | yes |     | yes | `REOLDEV`_     |
++---------+----------------+-----+-----+-----+----------------+
+| Fujitsu | `ix500`_       | yes |     | yes | `eonist`_      |
++---------+----------------+-----+-----+-----+----------------+
+| Fujitsu | `S1300i`_      | yes |     | yes | `jonaswinkler`_|
++---------+----------------+-----+-----+-----+----------------+
 
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Brand   | Model          | Supports                          | Recommended By |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-|         |                | FTP | NFS | SMB | SMTP | API [1]_ |                |
-+=========+================+=====+=====+=====+======+==========+================+
-| Brother | `ADS-1700W`_   | yes | no  | yes | yes  |          |`holzhannes`_   |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Brother | `ADS-1600W`_   | yes | no  | yes | yes  |          |`holzhannes`_   |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Brother | `ADS-1500W`_   | yes | no  | yes | yes  |          |`danielquinn`_  |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Brother | `ADS-1100W`_   | yes | no  | no  | no   |          |`ytzelf`_       |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Brother | `MFC-J6930DW`_ | yes |     |     |      |          |`ayounggun`_    |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Brother | `MFC-L5850DW`_ | yes |     |     | yes  |          |`holzhannes`_   |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Brother | `MFC-J5910DW`_ | yes |     |     |      |          |`bmsleight`_    |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Brother | `MFC-9142CDN`_ | yes |     | yes |      |          |`REOLDEV`_      |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Fujitsu | `ix500`_       | yes |     | yes |      |          |`eonist`_       |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Epson   | `WF-7710DWF`_  | yes |     | yes |      |          |`Skylinar`_     |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Fujitsu | `S1300i`_      | yes |     | yes |      |          |`jonaswinkler`_ |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-| Doxie   | `Q2`_          | no  | no  | no  | no   | yes      |`Unkn0wnCat`_   |
-+---------+----------------+-----+-----+-----+------+----------+----------------+
-
-.. _MFC-L5850DW: https://www.brother-usa.com/products/mfcl5850dw
-.. _ADS-1700W: https://www.brother-usa.com/products/ads1700w
-.. _ADS-1600W: https://www.brother-usa.com/products/ads1600w
 .. _ADS-1500W: https://www.brother.ca/en/p/ads1500w
-.. _ADS-1100W: https://support.brother.com/g/b/downloadtop.aspx?c=fr&lang=fr&prod=ads1100w_eu_as_cn
 .. _MFC-J6930DW: https://www.brother.ca/en/p/MFCJ6930DW
 .. _MFC-J5910DW: https://www.brother.co.uk/printers/inkjet-printers/mfcj5910dw
 .. _MFC-9142CDN: https://www.brother.co.uk/printers/laser-printers/mfc9140cdn
-.. _ix500: http://www.fujitsu.com/us/products/computing/peripheral/scanners/scansnap/ix500/
-.. _WF-7710DWF: https://www.epson.de/en/products/printers/inkjet-printers/for-home/workforce-wf-7710dwf
+.. _ix500: https://www.fujitsu.com/global/products/computing/peripheral/scanners/scansnap/ix500/
 .. _S1300i: https://www.fujitsu.com/global/products/computing/peripheral/scanners/soho/s1300i/
-.. _Q2: https://www.getdoxie.com/product/doxie-q/
-
 
 .. _danielquinn: https://github.com/danielquinn
 .. _ayounggun: https://github.com/ayounggun
 .. _bmsleight: https://github.com/bmsleight
 .. _eonist: https://github.com/eonist
 .. _REOLDEV: https://github.com/REOLDEV
-.. _Skylinar: https://github.com/Skylinar
 .. _jonaswinkler: https://github.com/jonaswinkler
-.. _holzhannes: https://github.com/holzhannes
-.. _ytzelf: https://github.com/ytzelf
-.. _Unkn0wnCat: https://github.com/Unkn0wnCat
-
-.. [1] Scanners with API Integration allow to push scanned documents directly to :ref:`Paperless API <api-file_uploads>`, sometimes referred to as Webhook or Document POST.
-
-Mobile phone software
-=====================
-
-You can use your phone to "scan" documents. The regular camera app will work, but may have too low contrast for OCR to work well. Apps specifically for scanning are recommended.
-
-+-------------------+----------------+-----+-----+-----+-------+--------+------------------+
-| Name              | OS             | Supports                         | Recommended By   |
-+-------------------+----------------+-----+-----+-----+-------+--------+------------------+
-|                   |                | FTP | NFS | SMB | Email | WebDav |                  |
-+===================+================+=====+=====+=====+=======+========+==================+
-| `Office Lens`_    | Android        | ?   | ?   | ?   | ?     | ?      | `jonaswinkler`_  |
-+-------------------+----------------+-----+-----+-----+-------+--------+------------------+
-| `Genius Scan`_    | Android        | yes | no  | yes | yes   | yes    | `hannahswain`_   |
-+-------------------+----------------+-----+-----+-----+-------+--------+------------------+
-| `OpenScan`_       | Android        | no  | no  | no  | no    | no     | `benjaminfrank`_ |
-+-------------------+----------------+-----+-----+-----+-------+--------+------------------+
-| `Quick Scan`_     | iOS            | no  | no  | no  | no    | no     | `holzhannes`_    |
-+-------------------+----------------+-----+-----+-----+-------+--------+------------------+
-
-On Android, you can use these applications in combination with one of the :ref:`Paperless-ng compatible apps <usage-mobile_upload>` to "Share" the documents produced by these scanner apps with paperless. On iOS, you can share the scanned documents via iOS-Sharing to other mail, WebDav or FTP apps.
-
-.. _Office Lens: https://play.google.com/store/apps/details?id=com.microsoft.office.officelens
-.. _Genius Scan: https://play.google.com/store/apps/details?id=com.thegrizzlylabs.geniusscan.free
-.. _Quick Scan: https://apps.apple.com/us/app/quickscan-scanner-text-ocr/id1513790291
-.. _OpenScan: https://github.com/Ethereal-Developers-Inc/OpenScan
-
-.. _hannahswain: https://github.com/hannahswain
-.. _benjaminfrank: https://github.com/benjaminfrank

docs/screenshots.rst

@@ -9,37 +9,40 @@ research papers though, its a horrible tool for that job.
 
 The dashboard shows customizable views on your document and allows document uploads:
 
-.. image:: _static/screenshots/dashboard.png
+.. image:: _static/paperless-0-dashboard.png
 
 The document list provides three different styles to scroll through your documents:
 
-.. image:: _static/screenshots/documents-table.png
-.. image:: _static/screenshots/documents-smallcards.png
-.. image:: _static/screenshots/documents-largecards.png
+.. image:: _static/paperless-1-list-table.png
+.. image:: _static/paperless-2-list-smallcards.png
+.. image:: _static/paperless-3-list-largecards.png
 
 Extensive filtering mechanisms:
 
-.. image:: _static/screenshots/documents-filter.png
+.. image:: _static/paperless-4-filter.png
 
-Side-by-side editing of documents. Optimized for 1080p.
+Side-by-side editing of documents. Optmized for 1080p.
 
-.. image:: _static/screenshots/editing.png
+.. image:: _static/paperless-5-editing.png
 
 Tag editing. This looks about the same for correspondents and document types.
 
-.. image:: _static/screenshots/new-tag.png
+.. image:: _static/paperless-6-tags.png
 
 Searching provides auto complete and highlights the results.
 
-.. image:: _static/screenshots/search-preview.png
-.. image:: _static/screenshots/search-results.png
+.. image:: _static/paperless-7-autocomplete.png
+.. image:: _static/paperless-8-search-results.png
+
+The old admin is still there and accessible!
+
+.. image:: _static/paperless-9-admin.png
 
 Fancy mail filters!
 
-.. image:: _static/screenshots/mail-rules-edited.png
+.. image:: _static/paperless-11-mail-filters.png
 
-Mobile support in the future? This kinda works, however some layouts are still
-too wide.
+Mobile support in the future? This doesn't really work yet.
 
-.. image:: _static/screenshots/mobile.png
+.. image:: _static/paperless-10-mobile.png
 

docs/setup.rst

@@ -3,6 +3,35 @@
 Setup
 *****
 
+Download
+########
+
+Go to the project page on GitHub and download the
+`latest release <https://github.com/jonaswinkler/paperless-ng/releases>`_.
+There are multiple options available.
+
+*   Download the dockerfiles archive if you want to pull paperless from
+    Docker Hub.
+
+*   Download the dist archive and extract it if you want to build the docker image
+    yourself or want to install paperless without docker.
+
+.. hint::
+
+    In contrast to paperless, the recommended way to get and update paperless-ng
+    is not to pull the entire git repository. Paperless-ng includes artifacts
+    that need to be compiled, and that's already done for you in the release.
+
+.. admonition:: Want to try out paperless-ng before migrating?
+
+    The release contains a file ``.env`` which sets the docker-compose project
+    name to "paperless", which is the same as before and instructs docker-compose
+    to reuse and upgrade your paperless volumes.
+
+    Just rename the project name in that file to anything else and docker-compose
+    will create fresh volumes for you!
+
+
 Overview of Paperless-ng
 ########################
 
@@ -20,45 +49,45 @@ Paperless consists of the following components:
     .. code:: shell-session
 
         $ cd /path/to/paperless/src/
-        $ gunicorn -c ../gunicorn.conf.py paperless.wsgi
+        $ pipenv run gunicorn -c /usr/src/paperless/gunicorn.conf.py -b 0.0.0.0:8000 paperless.wsgi
 
     or by any other means such as Apache ``mod_wsgi``.
 
 *   **The consumer:** This is what watches your consumption folder for documents.
-    However, the consumer itself does not really consume your documents.
-    Now it notifies a task processor that a new file is ready for consumption.
+    However, the consumer itself does not consume really consume your documents anymore.
+    It rather notifies a task processor that a new file is ready for consumption.
     I suppose it should be named differently.
-    This was also used to check your emails, but that's now done elsewhere as well.
+    This also used to check your emails, but that's now gone elsewhere as well.
 
     Start the consumer with the management command ``document_consumer``:
 
     .. code:: shell-session
 
         $ cd /path/to/paperless/src/
-        $ python3 manage.py document_consumer
+        $ pipenv run python3 manage.py document_consumer
 
     .. _setup-task_processor:
 
 *   **The task processor:** Paperless relies on `Django Q <https://django-q.readthedocs.io/en/latest/>`_
-    for doing most of the heavy lifting. This is a task queue that accepts tasks from
-    multiple sources and processes these in parallel. It also comes with a scheduler that executes
+    for doing much of the heavy lifting. This is a task queue that accepts tasks from
+    multiple sources and processes tasks in parallel. It also comes with a scheduler that executes
     certain commands periodically.
 
     This task processor is responsible for:
 
     *   Consuming documents. When the consumer finds new documents, it notifies the task processor to
         start a consumption task.
+    *   Consuming emails. It periodically checks your configured accounts for new mails and
+        produces consumption tasks for any documents it finds.
     *   The task processor also performs the consumption of any documents you upload through
         the web interface.
-    *   Consuming emails. It periodically checks your configured accounts for new emails and
-        notifies the task processor to consume the attachment of an email.
-    *   Maintaining the search index and the automatic matching algorithm. These are things that paperless
+    *   Maintain the search index and the automatic matching algorithm. These are things that paperless
         needs to do from time to time in order to operate properly.
 
     This allows paperless to process multiple documents from your consumption folder in parallel! On
-    a modern multi core system, this makes the consumption process with full OCR blazingly fast.
+    a modern multicore system, consumption with full ocr is blazing fast.
 
-    The task processor comes with a built-in admin interface that you can use to check whenever any of the
+    The task processor comes with a built-in admin interface that you can use to see whenever any of the
     tasks fail and inspect the errors (i.e., wrong email credentials, errors during consuming a specific
     file, etc).
 
@@ -67,96 +96,61 @@ Paperless consists of the following components:
     .. code:: shell-session
 
         $ cd /path/to/paperless/src/
-        $ python3 manage.py qcluster
+        $ pipenv run python3 manage.py qcluster
 
 *   A `redis <https://redis.io/>`_ message broker: This is a really lightweight service that is responsible
-    for getting the tasks from the webserver and the consumer to the task scheduler. These run in a different
-    process (maybe even on different machines!), and therefore, this is necessary.
+    for getting the tasks from the webserver and consumer to the task scheduler. These run in different
+    processes (maybe even on different machines!), and therefore, this is necessary.
 
-*   Optional: A database server. Paperless supports both PostgreSQL and SQLite for storing its data.
+*   A database server. Paperless supports PostgreSQL and sqlite for storing its data. However, with the
+    added concurrency, it is strongly advised to use PostgreSQL, as sqlite has its limits in that regard.
 
 
 Installation
 ############
 
-You can go multiple routes to setup and run Paperless:
+You can go multiple routes with setting up and running Paperless:
 
-* :ref:`Use the easy install docker script <setup-docker_script>`
-* :ref:`Pull the image from Docker Hub <setup-docker_hub>`
-* :ref:`Build the Docker image yourself <setup-docker_build>`
-* :ref:`Install Paperless directly on your system manually (bare metal) <setup-bare_metal>`
-* :ref:`Use ansible to install Paperless on your system automatically (bare metal) <setup-ansible>`
+* The `docker route`_
+* The `bare metal route`_
 
-The Docker routes are quick & easy. These are the recommended routes. This configures all the stuff
-from the above automatically so that it just works and uses sensible defaults for all configuration options.
-Here you find a cheat-sheet for docker beginners: `CLI Basics <https://sehn.tech/post/devops-with-docker/>`_
+The `docker route`_ is quick & easy. This is the recommended route. This configures all the stuff
+from above automatically so that it just works and uses sensible defaults for all configuration options.
 
-The bare metal route is complicated to setup but makes it easier
+The `bare metal route`_ is more complicated to setup but makes it easier
 should you want to contribute some code back. You need to configure and
 run the above mentioned components yourself.
 
-The ansible route combines benefits of both options:
-the setup process is fully automated, reproducible and `idempotent <https://docs.ansible.com/ansible/latest/reference_appendices/glossary.html#Idempotency>`_,
-it includes the same sensible defaults, and it simultaneously provides the flexibility of a bare metal installation.
+Docker Route
+============
 
-.. _CLI Basics: https://sehn.tech/post/devops-with-docker/
-.. _idempotent: https://docs.ansible.com/ansible/latest/reference_appendices/glossary.html#Idempotency
-
-.. _setup-docker_script:
-
-Install Paperless from Docker Hub using the installation script
-===============================================================
-
-Paperless provides an interactive installation script. This script will ask you
-for a couple configuration options, download and create the necessary configuration files, pull the docker image, start paperless and create your user account. This script essentially
-performs all the steps described in :ref:`setup-docker_hub` automatically.
-
-1.  Make sure that docker and docker-compose are installed.
-2.  Download and run the installation script:
-
-    .. code:: shell-session
-
-        $ curl -L https://raw.githubusercontent.com/jonaswinkler/paperless-ng/master/install-paperless-ng.sh | bash
-
-.. _setup-docker_hub:
-
-Install Paperless from Docker Hub
-=================================
-
-1.  Login with your user and create a folder in your home-directory `mkdir -v ~/paperless-ng` to have a place for your configuration files and consumption directory.
-
-2.  Go to the `/docker/compose directory on the project page <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`_
-    and download one of the `docker-compose.*.yml` files, depending on which database backend you
-    want to use. Rename this file to `docker-compose.yml`.
-    If you want to enable optional support for Office documents, download a file with `-tika` in the file name.
-    Download the ``docker-compose.env`` file and the ``.env`` file as well and store them
-    in the same directory.
-
-    .. hint::
-
-        For new installations, it is recommended to use PostgreSQL as the database
-        backend.
-
-3.  Install `Docker`_ and `docker-compose`_.
+1.  Install `Docker`_ and `docker-compose`_. [#compose]_
 
     .. caution::
 
         If you want to use the included ``docker-compose.*.yml`` file, you
         need to have at least Docker version **17.09.0** and docker-compose
         version **1.17.0**.
-        To check do: `docker-compose -v` or `docker -v`
 
         See the `Docker installation guide`_ on how to install the current
         version of Docker for your operating system or Linux distribution of
-        choice. To get the latest version of docker-compose, follow the
+        choice. To get an up-to-date version of docker-compose, follow the
         `docker-compose installation guide`_ if your package repository doesn't
         include it.
 
         .. _Docker installation guide: https://docs.docker.com/engine/installation/
         .. _docker-compose installation guide: https://docs.docker.com/compose/install/
 
-4.  Modify ``docker-compose.yml`` to your preferences. You may want to change the path
-    to the consumption directory. Find the line that specifies where
+2.  Copy either ``docker-compose.sqlite.yml`` or ``docker-compose.postgres.yml`` to
+    ``docker-compose.yml``, depending on which database backend you want to use.
+
+    .. hint::
+
+        For new installations, it is recommended to use postgresql as the database
+        backend. This is due to the increased amount of concurrency in paperless-ng.
+
+2.  Modify ``docker-compose.yml`` to your preferences. You should change the path
+    to the consumption directory in this file. Find the line that specifies where
     to mount the consumption directory:
 
     .. code::
@@ -172,34 +166,24 @@ Install Paperless from Docker Hub
     Don't change the part after the colon or paperless wont find your documents.
 
 
-5.  Modify ``docker-compose.env``, following the comments in the file. The
+3.  Modify ``docker-compose.env``, following the comments in the file. The
     most important change is to set ``USERMAP_UID`` and ``USERMAP_GID``
-    to the uid and gid of your user on the host system. Use ``id -u`` and
-    ``id -g`` to get these.
-
-    This ensures that
+    to the uid and gid of your user on the host system. This ensures that
     both the docker container and you on the host machine have write access
     to the consumption directory. If your UID and GID on the host system is
     1000 (the default for the first normal user on most systems), it will
-    work out of the box without any modifications. `id "username"` to check.
+    work out of the box without any modifications.
 
     .. note::
 
-        You can copy any setting from the file ``paperless.conf.example`` and paste it here.
-        Have a look at :ref:`configuration` to see what's available.
+        You can use any settings from the file ``paperless.conf`` in this file.
+        Have a look at :ref:`configuration` to see whats available.
 
-    .. caution::
+4.  Run ``docker-compose up -d``. This will create and start the necessary
+    containers. This will also build the image of paperless if you grabbed the
+    source archive.
 
-        Some file systems such as NFS network shares don't support file system
-        notifications with ``inotify``. When storing the consumption directory
-        on such a file system, paperless will not pick up new files
-        with the default configuration. You will need to use ``PAPERLESS_CONSUMER_POLLING``,
-        which will disable inotify. See :ref:`here <configuration-polling>`.
-
-6.  Run ``docker-compose pull``, followed by ``docker-compose up -d``.
-    This will pull the image, create and start the necessary containers.
-
-7.  To be able to login, you will need a super user. To create it, execute the
+5.  To be able to login, you will need a super user. To create it, execute the
     following command:
 
     .. code-block:: shell-session
@@ -207,378 +191,40 @@ Install Paperless from Docker Hub
         $ docker-compose run --rm webserver createsuperuser
 
     This will prompt you to set a username, an optional e-mail address and
-    finally a password (at least 8 characters).
+    finally a password.
 
-8.  The default ``docker-compose.yml`` exports the webserver on your local port
-    8000. If you did not change this, you should now be able to visit your
-    Paperless instance at ``http://127.0.0.1:8000`` or your servers IP-Address:8000.
-    Use the login credentials you have created with the previous step.
+6.  The default ``docker-compose.yml`` exports the webserver on your local port
+    8000. If you haven't adapted this, you should now be able to visit your
+    Paperless instance at ``http://127.0.0.1:8000``. You can login with the
+    user and password you just created.
 
 .. _Docker: https://www.docker.com/
 .. _docker-compose: https://docs.docker.com/compose/install/
 
-.. _setup-docker_build:
+.. [#compose] You of course don't have to use docker-compose, but it
+   simplifies deployment immensely. If you know your way around Docker, feel
+   free to tinker around without using compose!
 
-Build the Docker image yourself
-===============================
-
-1.  Clone the entire repository of paperless:
-
-    .. code:: shell-session
-
-        git clone https://github.com/jonaswinkler/paperless-ng
-
-    The master branch always reflects the latest stable version.
-
-2.  Copy one of the ``docker/compose/docker-compose.*.yml`` to ``docker-compose.yml`` in the root folder,
-    depending on which database backend you want to use. Copy
-    ``docker-compose.env`` into the project root as well.
-
-3.  In the ``docker-compose.yml`` file, find the line that instructs docker-compose to pull the paperless image from Docker Hub:
-
-    .. code:: yaml
-
-        webserver:
-            image: jonaswinkler/paperless-ng:latest
-
-    and replace it with a line that instructs docker-compose to build the image from the current working directory instead:
-
-    .. code:: yaml
-
-        webserver:
-            build: .
-
-4.  Run the ``compile-frontend.sh`` script. This requires ``node`` and ``npm >= v15``.
-
-5.  Follow steps 3 to 8 of :ref:`setup-docker_hub`. When asked to run
-    ``docker-compose pull`` to pull the image, do
-
-    .. code:: shell-session
-
-        $ docker-compose build
-
-    instead to build the image.
-
-.. _setup-bare_metal:
 
 Bare Metal Route
 ================
 
-Paperless runs on linux only. The following procedure has been tested on a minimal
-installation of Debian/Buster, which is the current stable release at the time of
-writing. Windows is not and will never be supported.
+.. warning::
 
-1.  Install dependencies. Paperless requires the following packages.
-
-    *   ``python3`` 3.6, 3.7, 3.8, 3.9
-    *   ``python3-pip``
-    *   ``python3-dev``
-
-    *   ``fonts-liberation`` for generating thumbnails for plain text files
-    *   ``imagemagick`` >= 6 for PDF conversion
-    *   ``optipng`` for optimizing thumbnails
-    *   ``gnupg`` for handling encrypted documents
-    *   ``libpq-dev`` for PostgreSQL
-    *   ``libmagic-dev`` for mime type detection
-    *   ``mime-support`` for mime type detection
-
-    Use this list for your preferred package management:
-
-    .. code::
-
-        python3 python3-pip python3-dev imagemagick fonts-liberation optipng gnupg libpq-dev libmagic-dev mime-support
-
-    These dependencies are required for OCRmyPDF, which is used for text recognition.
-
-    *   ``unpaper``
-    *   ``ghostscript``
-    *   ``icc-profiles-free``
-    *   ``qpdf``
-    *   ``liblept5``
-    *   ``libxml2``
-    *   ``pngquant``
-    *   ``zlib1g``
-    *   ``tesseract-ocr`` >= 4.0.0 for OCR
-    *   ``tesseract-ocr`` language packs (``tesseract-ocr-eng``, ``tesseract-ocr-deu``, etc)
-
-    Use this list for your preferred package management:
-
-    .. code::
-
-        unpaper ghostscript icc-profiles-free qpdf liblept5 libxml2 pngquant zlib1g tesseract-ocr
-
-    On Raspberry Pi, these libraries are required as well:
-
-    *   ``libatlas-base-dev``
-    *   ``libxslt1-dev``
-
-    You will also need ``build-essential``, ``python3-setuptools`` and ``python3-wheel``
-    for installing some of the python dependencies.
-
-2.  Install ``redis`` >= 5.0 and configure it to start automatically.
-
-3.  Optional. Install ``postgresql`` and configure a database, user and password for paperless. If you do not wish
-    to use PostgreSQL, SQLite is available as well.
-
-4.  Get the release archive from `<https://github.com/jonaswinkler/paperless-ng/releases>`_.
-    If you clone the git repo as it is, you also have to compile the front end by yourself.
-    Extract the archive to a place from where you wish to execute it, such as ``/opt/paperless``.
-
-5.  Configure paperless. See :ref:`configuration` for details. Edit the included ``paperless.conf`` and adjust the
-    settings to your needs. Required settings for getting paperless running are:
-
-    *   ``PAPERLESS_REDIS`` should point to your redis server, such as redis://localhost:6379.
-    *   ``PAPERLESS_DBHOST`` should be the hostname on which your PostgreSQL server is running. Do not configure this
-        to use SQLite instead. Also configure port, database name, user and password as necessary.
-    *   ``PAPERLESS_CONSUMPTION_DIR`` should point to a folder which paperless should watch for documents. You might
-        want to have this somewhere else. Likewise, ``PAPERLESS_DATA_DIR`` and ``PAPERLESS_MEDIA_ROOT`` define where
-        paperless stores its data. If you like, you can point both to the same directory.
-    *   ``PAPERLESS_SECRET_KEY`` should be a random sequence of characters. It's used for authentication. Failure
-        to do so allows third parties to forge authentication credentials.
-
-    Many more adjustments can be made to paperless, especially the OCR part. The following options are recommended
-    for everyone:
-
-    *   Set ``PAPERLESS_OCR_LANGUAGE`` to the language most of your documents are written in.
-    *   Set ``PAPERLESS_TIME_ZONE`` to your local time zone.
-
-6.  Create a system user under which you wish to run paperless.
-
-    .. code:: shell-session
-
-        adduser paperless --system --home /opt/paperless --group
-
-7.  Ensure that these directories exist
-    and that the paperless user has write permissions to the following directories:
-
-    *   ``/opt/paperless/media``
-    *   ``/opt/paperless/data``
-    *   ``/opt/paperless/consume``
-
-    Adjust as necessary if you configured different folders.
-
-8.  Install python requirements from the ``requirements.txt`` file.
-    It is up to you if you wish to use a virtual environment or not. First you should update your pip, so it gets the actual packages.
-
-    .. code:: shell-session
-
-        sudo -Hu paperless pip3 install --upgrade pip
-
-    .. code:: shell-session
-
-        sudo -Hu paperless pip3 install -r requirements.txt
-
-    This will install all python dependencies in the home directory of
-    the new paperless user.
-
-9.  Go to ``/opt/paperless/src``, and execute the following commands:
-
-    .. code:: bash
-
-        # This creates the database schema.
-        sudo -Hu paperless python3 manage.py migrate
-
-        # This creates your first paperless user
-        sudo -Hu paperless python3 manage.py createsuperuser
-
-10. Optional: Test that paperless is working by executing
-
-      .. code:: bash
-
-        # This collects static files from paperless and django.
-        sudo -Hu paperless python3 manage.py runserver
-
-    and pointing your browser to http://localhost:8000/.
-
-    .. warning::
-
-        This is a development server which should not be used in
-        production. It is not audited for security and performance
-        is inferior to production ready web servers.
-
-    .. hint::
-
-        This will not start the consumer. Paperless does this in a
-        separate process.
-
-11. Setup systemd services to run paperless automatically. You may
-    use the service definition files included in the ``scripts`` folder
-    as a starting point.
-
-    Paperless needs the ``webserver`` script to run the webserver, the
-    ``consumer`` script to watch the input folder, and the ``scheduler``
-    script to run tasks such as email checking and document consumption.
-
-    You may need to adjust the path to the ``gunicorn`` executable. This
-    will be installed as part of the python dependencies, and is either located
-    in the ``bin`` folder of your virtual environment, or in ``~/.local/bin/`` if
-    no virtual environment is used.
-
-    These services rely on redis and optionally the database server, but
-    don't need to be started in any particular order. The example files
-    depend on redis being started. If you use a database server, you should
-    add additional dependencies.
-
-    .. caution::
-
-        The included scripts run a ``gunicorn`` standalone server,
-        which is fine for running paperless. It does support SSL,
-        however, the documentation of GUnicorn states that you should
-        use a proxy server in front of gunicorn instead.
-
-        For instructions on how to use nginx for that,
-        :ref:`see the instructions below <setup-nginx>`.
-
-12. Optional: Install a samba server and make the consumption folder
-    available as a network share.
-
-13. Configure ImageMagick to allow processing of PDF documents. Most distributions have
-    this disabled by default, since PDF documents can contain malware. If
-    you don't do this, paperless will fall back to ghostscript for certain steps
-    such as thumbnail generation.
-
-    Edit ``/etc/ImageMagick-6/policy.xml`` and adjust
-
-    .. code::
-
-        <policy domain="coder" rights="none" pattern="PDF" />
-
-    to
-
-    .. code::
-
-        <policy domain="coder" rights="read|write" pattern="PDF" />
-
-14. Optional: Install the `jbig2enc <https://ocrmypdf.readthedocs.io/en/latest/jbig2.html>`_
-    encoder. This will reduce the size of generated PDF documents. You'll most likely need
-    to compile this by yourself, because this software has been patented until around 2017 and
-    binary packages are not available for most distributions.
-
-.. _setup-ansible:
-
-Install Paperless using ansible
-===============================
-
-.. note::
-
-    This role currently only supports Debian 10 Buster and Ubuntu 20.04 Focal or later as target hosts.
-		Additionally, only i386 or amd64 based hosts are supported right now, i.e. installation on arm hosts will fail.
-
-1.  Install ansible 2.7+ on the management node.
-    This may be the target host paperless-ng is being installed on or any remote host which can access the target host.
-    For further details, check the ansible `inventory <https://docs.ansible.com/ansible/latest/user_guide/intro_inventory.html>`_ documentation.
-
-    On Debian and Ubuntu, the official repositories should provide a suitable version:
-
-    .. code:: bash
-
-        apt install ansible
-        ansible --version
-
-    Alternatively, you can install the most recent ansible release using PyPI:
-
-    .. code:: bash
-
-        python3 -m pip install ansible
-        ansible --version
-
-    Make sure your taget hosts are accessible:
-
-    .. code:: sh
-
-        ansible -m ping YourAnsibleTargetHostGoesHere
-
-2.  Install the latest tag of the ansible role using ansible-galaxy
-
-    .. code:: sh
-
-        ansible-galaxy install git+https://github.com/jonaswinkler/paperless-ng.git,ng-1.4.2
-
-3.  Create an ansible ``playbook.yml`` in a directory of your choice:
-
-    .. code:: yaml
-
-        - hosts: YourAnsibleTargetHostGoesHere
-          become: yes
-          vars_files:
-            - vars/paperless-ng.yml
-          roles:
-            - paperless-ng
-
-    Optional: If you also want to use PostgreSQL on the target system, install and add (for example) the `geerlingguy.postgresql <https://github.com/geerlingguy/ansible-role-postgresql>`_ role:
-
-    .. code:: sh
-
-        ansible-galaxy install geerlingguy.postgresql
-
-    .. code:: yaml
-
-        - hosts: YourAnsibleTargetHostGoesHere
-          become: yes
-          vars_files:
-            - vars/paperless-ng.yml
-          roles:
-            - geerlingguy.postgresql
-            - paperless-ng
-
-    Optional: If you also want to use a reverse proxy on the target system, install and add (for example) the `geerlingguy.nginx <https://github.com/geerlingguy/ansible-role-nginx>`_ role:
-
-    .. code:: sh
-
-        ansible-galaxy install geerlingguy.nginx
-
-    .. code:: yaml
-
-        - hosts: YourAnsibleTargetHostGoesHere
-          become: yes
-          vars_files:
-            - vars/paperless-ng.yml
-          roles:
-            - geerlingguy.postgresql
-            - paperless-ng
-            - geerlingguy.nginx
-
-4.  Create ``vars/paperless-ng.yml`` to configure your ansible deployment:
-
-    .. code:: yaml
-
-        paperlessng_secret_key: PleaseGenerateAStrongKeyForThis
-
-        paperlessng_superuser_name: YourUserName
-        paperlessng_superuser_email: name@domain.tld
-        paperlessng_superuser_password: YourDesiredPasswordUsedForFirstLogin
-
-        paperlessng_ocr_languages:
-            - eng
-            - deu
-
-    For all of the available options, please check ``ansible/README.md`` and :ref:`configuration`.
-
-    Optional configurations for the above-mentioned PostgreSQL and nginx roles would also go here.
-
-5. Run the ansible playbook from the management node:
-
-    .. code:: sh
-
-        ansible-playbook playbook.yml
-
-    When this step completes successfully, paperless-ng will be available on the target host at ``http://127.0.0.1:8000`` (or the address you configured).
+    TBD. User docker for now.
 
 Migration to paperless-ng
 #########################
 
 At its core, paperless-ng is still paperless and fully compatible. However, some
 things have changed under the hood, so you need to adapt your setup depending on
-how you installed paperless.
-
-This setup describes how to update an existing paperless Docker installation.
-The important things to keep in mind are as follows:
+how you installed paperless. The important things to keep in mind are as follows.
 
 * Read the :ref:`changelog <paperless_changelog>` and take note of breaking changes.
-* You should decide if you want to stick with SQLite or want to migrate your database
-  to PostgreSQL. See :ref:`setup-sqlite_to_psql` for details on how to move your data from
-  SQLite to PostgreSQL. Both work fine with paperless. However, if you already have a
-  database server running for other services, you might as well use it for paperless as well.
+* It is recommended to use postgresql as the database now. If you want to continue
+  using SQLite, which is the default of paperless, use ``docker-compose.sqlite.yml``.
+  See :ref:`setup-sqlite_to_psql` for details on how to move your data from
+  sqlite to postgres.
 * The task scheduler of paperless, which is used to execute periodic tasks
   such as email checking and maintenance, requires a `redis`_ message broker
   instance. The docker-compose route takes care of that.
@@ -600,46 +246,35 @@ Migration to paperless-ng is then performed in a few simple steps:
     paperless.
 
 3.  Download the latest release of paperless-ng. You can either go with the
-    docker-compose files from `here <https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose>`__
-    or clone the repository to build the image yourself (see :ref:`above <setup-docker_build>`).
+    docker-compose files or use the archive to build the image yourself.
     You can either replace your current paperless folder or put paperless-ng
     in a different location.
 
     .. caution::
 
-        Paperless-ng includes a ``.env`` file. This will set the
-        project name for docker compose to ``paperless``, which will also define the name
-        of the volumes by paperless-ng. However, if you experience that paperless-ng
-        is not using your old paperless volumes, verify the names of your volumes with
+        The release include a ``.env`` file. This will set the
+        project name for docker compose to ``paperless`` so that paperless-ng will
+        automatically reuse your existing paperless volumes. When you start it, it
+        will migrate your existing data. After that, your old paperless installation
+        will be incompatible with the migrated volumes.
 
-        .. code:: shell-session
-
-            $ docker volume ls | grep _data
-
-        and adjust the project name in the ``.env`` file so that it matches the name
-        of the volumes before the ``_data`` part.
-
-
-4.  Download the ``docker-compose.sqlite.yml`` file to ``docker-compose.yml``.
-    If you want to switch to PostgreSQL, do that after you migrated your existing
+4.  Copy the ``docker-compose.sqlite.yml`` file to ``docker-compose.yml``.
+    If you want to migrate to PostgreSQL, do that after you migrated your existing
     SQLite database.
 
-5.  Adjust ``docker-compose.yml`` and ``docker-compose.env`` to your needs.
-    See :ref:`setup-docker_hub` for details on which edits are advised.
+5.  Adjust ``docker-compose.yml`` and
+    ``docker-compose.env`` to your needs.
+    See `docker route`_ for details on which edits are advised.
 
-6.  :ref:`Update paperless. <administration-updating>`
+6.  Start paperless-ng.
 
-7.  In order to find your existing documents with the new search feature, you need
-    to invoke a one-time operation that will create the search index:
+    .. code:: bash
 
-    .. code:: shell-session
+        $ docker-compose up
 
-        $ docker-compose run --rm webserver document_index reindex
-
-    This will migrate your database and create the search index. After that,
-    paperless will take care of maintaining the index by itself.
-
-8.  Start paperless-ng.
+    If you see everything working (you should see some migrations getting
+    applied, for instance), you can gracefully stop paperless-ng with Ctrl-C
+    and then start paperless-ng as usual with
 
     .. code:: bash
 
@@ -647,11 +282,11 @@ Migration to paperless-ng is then performed in a few simple steps:
 
     This will run paperless in the background and automatically start it on system boot.
 
-9.  Paperless installed a permanent redirect to ``admin/`` in your browser. This
-    redirect is still in place and prevents access to the new UI. Clear your
+7.  Paperless installed a permanent redirect to ``admin/`` in your browser. This
+    redirect is still in place and prevents access to the new UI. Clear
     browsing cache in order to fix this.
 
-10.  Optionally, follow the instructions below to migrate your existing data to PostgreSQL.
+8.  Optionally, follow the instructions below to migrate your existing data to PostgreSQL.
 
 
 .. _setup-sqlite_to_psql:
@@ -664,20 +299,11 @@ management commands as below.
 
 .. caution::
 
-    Make sure that your SQLite database is migrated to the latest version.
+    Make sure that your sqlite database is migrated to the latest version.
     Starting paperless will make sure that this is the case. If your try to
     load data from an old database schema in SQLite into a newer database
     schema in PostgreSQL, you will run into trouble.
 
-.. warning::
-
-    On some database fields, PostgreSQL enforces predefined limits on maximum
-    length, whereas SQLite does not. The fields in question are the title of documents
-    (128 characters), names of document types, tags and correspondents (128 characters),
-    and filenames (1024 characters). If you have data in these fields that surpasses these
-    limits, migration to PostgreSQL is not possible and will fail with an error.
-
-
 1.  Stop paperless, if it is running.
 2.  Tell paperless to use PostgreSQL:
 
@@ -696,17 +322,19 @@ management commands as below.
 
             $ cd /path/to/paperless
             $ docker-compose run --rm webserver /bin/bash
-
-        This will launch the container and initialize the PostgreSQL database.
-
-    b)  Without docker, remember to activate any virtual environment, switch to
+        
+        This will lauch the container and initialize the PostgreSQL database.
+    
+    b)  Without docker, open a shell in your virtual environment, switch to
         the ``src`` directory and create the database schema:
 
         .. code:: shell-session
 
-            $ cd /path/to/paperless/src
+            $ cd /path/to/paperless
+            $ pipenv shell
+            $ cd src
             $ python3 manage.py migrate
-
+        
         This will not copy any data yet.
 
 4.  Dump your data from SQLite:
@@ -714,14 +342,14 @@ management commands as below.
     .. code:: shell-session
 
         $ python3 manage.py dumpdata --database=sqlite --exclude=contenttypes --exclude=auth.Permission > data.json
-
+    
 5.  Load your data into PostgreSQL:
 
     .. code:: shell-session
 
         $ python3 manage.py loaddata data.json
 
-6.  If operating inside Docker, you may exit the shell now.
+6.  Exit the shell.
 
     .. code:: shell-session
 
@@ -730,121 +358,30 @@ management commands as below.
 7.  Start paperless.
 
 
-Moving back to paperless
-========================
-
-Lets say you migrated to Paperless-ng and used it for a while, but decided that
-you don't like it and want to move back (If you do, send me a mail about what
-part you didn't like!), you can totally do that with a few simple steps.
-
-Paperless-ng modified the database schema slightly, however, these changes can
-be reverted while keeping your current data, so that your current data will
-be compatible with original Paperless.
-
-Execute this:
-
-.. code:: shell-session
-
-    $ cd /path/to/paperless
-    $ docker-compose run --rm webserver migrate documents 0023
-
-Or without docker:
-
-.. code:: shell-session
-
-    $ cd /path/to/paperless/src
-    $ python3 manage.py migrate documents 0023
-
-After that, you need to clear your cookies (Paperless-ng comes with updated
-dependencies that do cookie-processing differently) and probably your cache
-as well.
-
-.. _setup-less_powerful_devices:
-
-
 Considerations for less powerful devices
 ########################################
 
-Paperless runs on Raspberry Pi. However, some things are rather slow on the Pi and
+Paperless runs on Raspberry Pi. However, some things are rather slow on the Pi and 
 configuring some options in paperless can help improve performance immensely:
 
-*   Stick with SQLite to save some resources.
 *   Consider setting ``PAPERLESS_OCR_PAGES`` to 1, so that paperless will only OCR
-    the first page of your documents. In most cases, this page contains enough
-    information to be able to find it.
+    the first page of your documents.
 *   ``PAPERLESS_TASK_WORKERS`` and ``PAPERLESS_THREADS_PER_WORKER`` are configured
     to use all cores. The Raspberry Pi models 3 and up have 4 cores, meaning that
     paperless will use 2 workers and 2 threads per worker. This may result in
-    sluggish response times during consumption, so you might want to lower these
+    slugish response times during consumption, so you might want to lower these
     settings (example: 2 workers and 1 thread to always have some computing power
     left for other tasks).
-*   Keep ``PAPERLESS_OCR_MODE`` at its default value ``skip`` and consider OCR'ing
+*   Keep ``PAPERLESS_OCR_ALWAYS`` at its default value 'false' and consider OCR'ing
     your documents before feeding them into paperless. Some scanners are able to
-    do this! You might want to even specify ``skip_noarchive`` to skip archive
-    file generation for already ocr'ed documents entirely.
-*   If you want to perform OCR on the the device, consider using ``PAPERLESS_OCR_CLEAN=none``.
-    This will speed up OCR times and use less memory at the expense of slightly worse
-    OCR results.
+    do this!
+*   Lower ``PAPERLESS_CONVERT_DENSITY`` from its default value 300 to 200. This
+    will still result in rather accurate OCR, but will decrease consumption time
+    by quite a bit.
 *   Set ``PAPERLESS_OPTIMIZE_THUMBNAILS`` to 'false' if you want faster consumption
     times. Thumbnails will be about 20% larger.
-*   If using docker, consider setting ``PAPERLESS_WEBSERVER_WORKERS`` to
-    1. This will save some memory.
 
 For details, refer to :ref:`configuration`.
 
-.. note::
-
-    Updating the :ref:`automatic matching algorithm <advanced-automatic_matching>`
-    takes quite a bit of time. However, the update mechanism checks if your
-    data has changed before doing the heavy lifting. If you experience the
-    algorithm taking too much cpu time, consider changing the schedule in the
-    admin interface to daily. You can also manually invoke the task
-    by changing the date and time of the next run to today/now.
-
-    The actual matching of the algorithm is fast and works on Raspberry Pi as
-    well as on any other device.
 
 .. _redis: https://redis.io/
-
-
-.. _setup-nginx:
-
-Using nginx as a reverse proxy
-##############################
-
-If you want to expose paperless to the internet, you should hide it behind a
-reverse proxy with SSL enabled.
-
-In addition to the usual configuration for SSL,
-the following configuration is required for paperless to operate:
-
-.. code:: nginx
-
-    http {
-
-        # Adjust as required. This is the maximum size for file uploads.
-        # The default value 1M might be a little too small.
-        client_max_body_size 10M;
-
-        server {
-
-            location / {
-
-                # Adjust host and port as required.
-                proxy_pass http://localhost:8000/;
-
-                # These configuration options are required for WebSockets to work.
-                proxy_http_version 1.1;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection "upgrade";
-
-                proxy_redirect off;
-                proxy_set_header Host $host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Host $server_name;
-            }
-        }
-    }
-
-Also read `this <https://channels.readthedocs.io/en/stable/deploying.html#nginx-supervisor-ubuntu>`__, towards the end of the section.

docs/troubleshooting.rst

@@ -29,195 +29,75 @@ Check for the following issues:
 Consumer fails to pickup any new files
 ######################################
 
-If you notice that the consumer will only pickup files in the consumption
-directory at startup, but won't find any other files added later, you will need to
-enable filesystem polling with the configuration option
-``PAPERLESS_CONSUMER_POLLING``, see :ref:`here <configuration-polling>`.
-
-This will disable listening to filesystem changes with inotify and paperless will
-manually check the consumption directory for changes instead.
+If you notice, that the consumer will only pickup files in the consumption
+directory at startup, but won't find any other files added later, check out
+the configuration file and enable filesystem polling with the setting
+``PAPERLESS_CONSUMER_POLLING``.
 
 
-Paperless always redirects to /admin
+Consumer warns ``OCR for XX failed``
 ####################################
 
-You probably had the old paperless installed at some point. Paperless installed
-a permanent redirect to /admin in your browser, and you need to clear your
-browsing data / cache to fix that.
+If you find the OCR accuracy to be too low, and/or the document consumer warns
+that ``OCR for XX failed, but we're going to stick with what we've got since
+FORGIVING_OCR is enabled``, then you might need to install the
+`Tesseract language files <http://packages.ubuntu.com/search?keywords=tesseract-ocr>`_
+marching your document's languages.
+
+As an example, if you are running Paperless from any Ubuntu or Debian
+box, and your documents are written in Spanish you may need to run::
+
+    apt-get install -y tesseract-ocr-spa
 
 
-Operation not permitted
-#######################
 
-You might see errors such as:
+Consumer dies with ``convert: unable to extent pixel cache``
+############################################################
 
-.. code:: shell-session
+During the consumption process, Paperless invokes ImageMagick's ``convert``
+program to translate the source document into something that the OCR engine can
+understand and this can burn a Very Large amount of memory if the original
+document is rather long.  Similarly, if your system doesn't have a lot of
+memory to begin with (ie. a Raspberry Pi), then this can happen for even
+medium-sized documents.
 
-    chown: changing ownership of '../export': Operation not permitted
+The solution is to tell ImageMagick *not* to Use All The RAM, as is its
+default, and instead tell it to used a fixed amount.  ``convert`` will then
+break up the job into hundreds of individual files and use them to slowly
+compile the finished image.  Simply set ``PAPERLESS_CONVERT_MEMORY_LIMIT`` in
+``/etc/paperless.conf`` to something like ``32000000`` and you'll limit
+``convert`` to 32MB.  Fiddle with this value as you like.
 
-The container tries to set file ownership on the listed directories. This is
-required so that the user running paperless inside docker has write permissions
-to these folders. This happens when pointing these directories to NFS shares,
-for example.
-
-Ensure that ``chown`` is possible on these directories.
+**HOWEVER**: Simply setting this value may not be enough on system where
+``/tmp`` is mounted as tmpfs, as this is where ``convert`` will write its
+temporary files.  In these cases (most Systemd machines), you need to tell
+ImageMagick to use a different space for its scratch work.  You do this by
+setting ``PAPERLESS_CONVERT_TMPDIR`` in ``/etc/paperless.conf`` to somewhere
+that's actually on a physical disk (and writable by the user running
+Paperless), like ``/var/tmp/paperless`` or ``/home/my_user/tmp`` in a pinch.
 
 
-Classifier error: No training data available
-############################################
+DecompressionBombWarning and/or no text in the OCR output
+#########################################################
 
-This indicates that the Auto matching algorithm found no documents to learn from.
-This may have two reasons:
+Some users have had issues using Paperless to consume PDFs that were created
+by merging Very Large Scanned Images into one PDF.  If this happens to you,
+it's likely because the PDF you've created contains some very large pages
+(millions of pixels) and the process of converting the PDF to a OCR-friendly
+image is exploding.
 
-*   You don't use the Auto matching algorithm: The error can be safely ignored in this case.
-*   You are using the Auto matching algorithm: The classifier explicitly excludes documents
-    with Inbox tags. Verify that there are documents in your archive without inbox tags.
-    The algorithm will only learn from documents not in your inbox.
+Typically, this happens because the scanned images are created with a high
+DPI and then rolled into the PDF with an assumed DPI of 72 (the default).
+The best solution then is to specify the DPI used in the scan in the
+conversion-to-PDF step.  So for example, if you scanned the original image
+with a DPI of 300, then merging the images into the single PDF with
+``convert`` should look like this:
 
+.. code:: bash
 
-UserWarning in sklearn on every single document
-###############################################
+    $ convert -density 300 *.jpg finished.pdf
 
-You may encounter warnings like this:
+For more information on this and situations like it, you should take a look
+at `Issue #118`_ as that's where this tip originated.
 
-.. code::
-
-    /usr/local/lib/python3.7/site-packages/sklearn/base.py:315:
-    UserWarning: Trying to unpickle estimator CountVectorizer from version 0.23.2 when using version 0.24.0.
-    This might lead to breaking code or invalid results. Use at your own risk.
-
-This happens when certain dependencies of paperless that are responsible for the auto matching algorithm are
-updated. After updating these, your current training data *might* not be compatible anymore. This can be ignored
-in most cases. This warning will disappear automatically when paperless updates the training data.
-
-If you want to get rid of the warning or actually experience issues with automatic matching, delete
-the file ``classification_model.pickle`` in the data directory and let paperless recreate it.
-
-
-504 Server Error: Gateway Timeout when adding Office documents
-##############################################################
-
-You may experience these errors when using the optional TIKA integration:
-
-.. code::
-
-    requests.exceptions.HTTPError: 504 Server Error: Gateway Timeout for url: http://gotenberg:3000/forms/libreoffice/convert
-
-Gotenberg is a server that converts Office documents into PDF documents and has a default timeout of 30 seconds.
-When conversion takes longer, Gotenberg raises this error.
-
-You can increase the timeout by configuring an environment variable for Gotenberg (see also `here <https://gotenberg.dev/docs/modules/api#properties>`__).
-If using docker-compose, this is achieved by the following configuration change in the ``docker-compose.yml`` file:
-
-.. code:: yaml
-
-    gotenberg:
-        image: gotenberg/gotenberg:7
-        restart: unless-stopped
-        environment:
-            CHROMIUM_DISABLE_ROUTES: 1
-            API_PROCESS_TIMEOUT: 60
-
-Permission denied errors in the consumption directory
-#####################################################
-
-You might encounter errors such as:
-
-.. code:: shell-session
-
-    The following error occured while consuming document.pdf: [Errno 13] Permission denied: '/usr/src/paperless/src/../consume/document.pdf'
-
-This happens when paperless does not have permission to delete files inside the consumption directory.
-Ensure that ``USERMAP_UID`` and ``USERMAP_GID`` are set to the user id and group id you use on the host operating system, if these are
-different from ``1000``. See :ref:`setup-docker_hub`.
-
-Also ensure that you are able to read and write to the consumption directory on the host.
-
-
-OSError: [Errno 19] No such device when consuming files
-#######################################################
-
-If you experience errors such as:
-
-.. code:: shell-session
-
-    File "/usr/local/lib/python3.7/site-packages/whoosh/codec/base.py", line 570, in open_compound_file
-    return CompoundStorage(dbfile, use_mmap=storage.supports_mmap)
-    File "/usr/local/lib/python3.7/site-packages/whoosh/filedb/compound.py", line 75, in __init__
-    self._source = mmap.mmap(fileno, 0, access=mmap.ACCESS_READ)
-    OSError: [Errno 19] No such device
-
-    During handling of the above exception, another exception occurred:
-
-    Traceback (most recent call last):
-    File "/usr/local/lib/python3.7/site-packages/django_q/cluster.py", line 436, in worker
-    res = f(*task["args"], **task["kwargs"])
-    File "/usr/src/paperless/src/documents/tasks.py", line 73, in consume_file
-    override_tag_ids=override_tag_ids)
-    File "/usr/src/paperless/src/documents/consumer.py", line 271, in try_consume_file
-    raise ConsumerError(e)
-
-Paperless uses a search index to provide better and faster full text searching. This search index is stored inside
-the ``data`` folder. The search index uses memory-mapped files (mmap). The above error indicates that paperless
-was unable to create and open these files.
-
-This happens when you're trying to store the data directory on certain file systems (mostly network shares)
-that don't support memory-mapped files.
-
-
-Web-UI stuck at "Loading..."
-############################
-
-This might have multiple reasons.
-
-
-1.  If you built the docker image yourself or deployed using the bare metal route,
-    make sure that there are files in ``<paperless-root>/static/frontend/<lang-code>/``.
-    If there are no files, make sure that you executed ``collectstatic`` successfully, either
-    manually or as part of the docker image build.
-
-    If the front end is still missing, make sure that the front end is compiled (files present in
-    ``src/documents/static/frontend``). If it is not, you need to compile the front end yourself
-    or download the release archive instead of cloning the repository.
-
-2.  Check the output of the web server. You might see errors like this:
-
-
-    .. code::
-
-        [2021-01-25 10:08:04 +0000] [40] [ERROR] Socket error processing request.
-        Traceback (most recent call last):
-        File "/usr/local/lib/python3.7/site-packages/gunicorn/workers/sync.py", line 134, in handle
-            self.handle_request(listener, req, client, addr)
-        File "/usr/local/lib/python3.7/site-packages/gunicorn/workers/sync.py", line 190, in handle_request
-            util.reraise(*sys.exc_info())
-        File "/usr/local/lib/python3.7/site-packages/gunicorn/util.py", line 625, in reraise
-            raise value
-        File "/usr/local/lib/python3.7/site-packages/gunicorn/workers/sync.py", line 178, in handle_request
-            resp.write_file(respiter)
-        File "/usr/local/lib/python3.7/site-packages/gunicorn/http/wsgi.py", line 396, in write_file
-            if not self.sendfile(respiter):
-        File "/usr/local/lib/python3.7/site-packages/gunicorn/http/wsgi.py", line 386, in sendfile
-            sent += os.sendfile(sockno, fileno, offset + sent, count)
-        OSError: [Errno 22] Invalid argument
-
-    To fix this issue, add
-
-    .. code::
-
-        SENDFILE=0
-
-    to your `docker-compose.env` file.
-
-Error while reading metadata
-############################
-
-You might find messages like these in your log files:
-
-.. code::
-
-    [WARNING] [paperless.parsing.tesseract] Error while reading metadata
-
-This indicates that paperless failed to read PDF metadata from one of your documents. This happens when you
-open the affected documents in paperless for editing. Paperless will continue to work, and will simply not
-show the invalid metadata.
+.. _Issue #118: https://github.com/the-paperless-project/paperless/issues/118

docs/usage_overview.rst

@@ -5,13 +5,13 @@ Usage Overview
 Paperless is an application that manages your personal documents. With
 the help of a document scanner (see :ref:`scanners`), paperless transforms
 your wieldy physical document binders into a searchable archive and
-provides many utilities for finding and managing your documents.
+provices many utilities for finding and managing your documents.
 
 
 Terms and definitions
 #####################
 
-Paperless essentially consists of two different parts for managing your
+Paperless esentially consists of two different parts for managing your
 documents:
 
 * The *consumer* watches a specified folder and adds all documents in that
@@ -30,12 +30,12 @@ Each document has a couple of fields that you can assign to them:
   tag, however, a single document can also have multiple tags. This is not
   possible with folders. The reason folders are not implemented in paperless
   is simply that tags are much more versatile than folders.
-* A *document type* is used to demarcate the type of a document such as letter,
+* A *document type* is used to demarkate the type of a document such as letter,
   bank statement, invoice, contract, etc. It is used to identify what a document
   is about.
 * The *date added* of a document is the date the document was scanned into
   paperless. You cannot and should not change this date.
-* The *date created* of a document is the date the document was initially issued.
+* The *date created* of a document is the date the document was intially issued.
   This can be the date you bought a product, the date you signed a contract, or
   the date a letter was sent to you.
 * The *archive serial number* (short: ASN) of a document is the identifier of
@@ -57,29 +57,8 @@ Adding documents to paperless
 #############################
 
 Once you've got Paperless setup, you need to start feeding documents into it.
-When adding documents to paperless, it will perform the following operations on
-your documents:
-
-1.  OCR the document, if it has no text. Digital documents usually have text,
-    and this step will be skipped for those documents.
-2.  Paperless will create an archiveable PDF/A document from your document.
-    If this document is coming from your scanner, it will have embedded selectable text.
-3.  Paperless performs automatic matching of tags, correspondents and types on the
-    document before storing it in the database.
-
-.. hint::
-
-    This process can be configured to fit your needs. If you don't want paperless
-    to create archived versions for digital documents, you can configure that by
-    configuring ``PAPERLESS_OCR_MODE=skip_noarchive``. Please read the
-    :ref:`relevant section in the documentation <configuration-ocr>`.
-
-.. note::
-
-    No matter which options you choose, Paperless will always store the original
-    document that it found in the consumption directory or in the mail and
-    will never overwrite that document. Archived versions are stored alongside the
-    original versions.
+Currently, there are three options: the consumption directory, IMAP (email), and
+HTTP POST.
 
 
 The consumption directory
@@ -103,25 +82,6 @@ files from the scanner.  Typically, you're looking at an FTP server like
 
 .. TODO: hyperref to configuration of the location of this magic folder.
 
-Dashboard upload
-================
-
-The dashboard has a file drop field to upload documents to paperless. Simply drag a file
-onto this field or select a file with the file dialog. Multiple files are supported.
-
-
-.. _usage-mobile_upload:
-
-Mobile upload
-=============
-
-The mobile app over at `<https://github.com/qcasey/paperless_share>`_ allows Android users
-to share any documents with paperless. This can be combined with any of the mobile
-scanning apps out there, such as Office Lens.
-
-Furthermore, there is the  `Paperless App <https://github.com/bauerj/paperless_app>`_ as well,
-which not only has document upload, but also document browsing and download features.
-
 .. _usage-email:
 
 IMAP (Email)
@@ -171,7 +131,7 @@ These are as follows:
 
     With the correct set of rules, you can completely automate your email documents.
     Create rules for every correspondent you receive digital documents from and
-    paperless will read them automatically. The default action "mark as read" is
+    paperless will read them automatically. The default acion "mark as read" is
     pretty tame and will not cause any damage or data loss whatsoever.
 
     You can also setup a special folder in your mail account for paperless and use
@@ -196,121 +156,6 @@ REST API
 
 You can also submit a document using the REST API, see :ref:`api-file_uploads` for details.
 
-.. _basic-searching:
-
-
-Best practices
-##############
-
-Paperless offers a couple tools that help you organize your document collection. However,
-it is up to you to use them in a way that helps you organize documents and find specific
-documents when you need them. This section offers a couple ideas for managing your collection.
-
-Document types allow you to classify documents according to what they are. You can define
-types such as "Receipt", "Invoice", or "Contract". If you used to collect all your receipts
-in a single binder, you can recreate that system in paperless by defining a document type,
-assigning documents to that type and then filtering by that type to only see all receipts.
-
-Not all documents need document types. Sometimes its hard to determine what the type of a
-document is or it is hard to justify creating a document type that you only need once or twice.
-This is okay. As long as the types you define help you organize your collection in the way
-you want, paperless is doing its job.
-
-Tags can be used in many different ways. Think of tags are more versatile folders or binders.
-If you have a binder for documents related to university / your car or health care, you can
-create these binders in paperless by creating tags and assigning them to relevant documents.
-Just as with documents, you can filter the document list by tags and only see documents of
-a certain topic.
-
-With physical documents, you'll often need to decide which folder the document belongs to.
-The advantage of tags over folders and binders is that a single document can have multiple
-tags. A physical document cannot magically appear in two different folders, but with tags,
-this is entirely possible.
-
-.. hint::
-
-  This can be used in many different ways. One example: Imagine you're working on a particular
-  task, such as signing up for university. Usually you'll need to collect a bunch of different
-  documents that are already sorted into various folders. With the tag system of paperless,
-  you can create a new group of documents that are relevant to this task without destroying
-  the already existing organization. When you're done with the task, you could delete the
-  tag again, which would be equal to sorting documents back into the folder they belong into.
-  Or keep the tag, up to you.
-
-All of the logic above applies to correspondents as well. Attach them to documents if you
-feel that they help you organize your collection.
-
-When you've started organizing your documents, create a couple saved views for document collections
-you regularly access. This is equal to having labeled physical binders on your desk, except
-that these saved views are dynamic and simply update themselves as you add documents to the system.
-
-Here are a couple examples of tags and types that you could use in your collection.
-
-* An ``inbox`` tag for newly added documents that you haven't manually edited yet.
-* A tag ``car`` for everything car related (repairs, registration, insurance, etc)
-* A tag ``todo`` for documents that you still need to do something with, such as reply, or
-  perform some task online.
-* A tag ``bank account x`` for all bank statement related to that account.
-* A tag ``mail`` for anything that you added to paperless via its mail processing capabilities.
-* A tag ``missing_metadata`` when you still need to add some metadata to a document, but can't
-  or don't want to do this right now.
-
-.. _basic-usage_searching:
-
-Searching
-#########
-
-Paperless offers an extensive searching mechanism that is designed to allow you to quickly
-find a document you're looking for (for example, that thing that just broke and you bought
-a couple months ago, that contract you signed 8 years ago).
-
-When you search paperless for a document, it tries to match this query against your documents.
-Paperless will look for matching documents by inspecting their content, title, correspondent,
-type and tags. Paperless returns a scored list of results, so that documents matching your query
-better will appear further up in the search results.
-
-By default, paperless returns only documents which contain all words typed in the search bar.
-However, paperless also offers advanced search syntax if you want to drill down the results
-further.
-
-Matching documents with logical expressions:
-
-.. code::
-
-  shopname AND (product1 OR product2)
-
-Matching specific tags, correspondents or types:
-
-.. code::
-
-  type:invoice tag:unpaid
-  correspondent:university certificate
-
-Matching dates:
-
-.. code::
-
-  created:[2005 to 2009]
-  added:yesterday
-  modified:today
-
-Matching inexact words:
-
-.. code::
-
-  produ*name
-
-.. note::
-
-  Inexact terms are hard for search indexes. These queries might take a while to execute. That's why paperless offers
-  auto complete and query correction.
-
-All of these constructs can be combined as you see fit.
-If you want to learn more about the query language used by paperless, paperless uses Whoosh's default query language.
-Head over to `Whoosh query language <https://whoosh.readthedocs.io/en/latest/querylang.html>`_.
-For details on what date parsing utilities are available, see
-`Date parsing <https://whoosh.readthedocs.io/en/latest/dates.html#parsing-date-queries>`_.
-
 
 .. _usage-recommended_workflow:
 
@@ -337,7 +182,7 @@ Processing of the physical documents
 ====================================
 
 Keep a physical inbox. Whenever you receive a document that you need to
-archive, put it into your inbox. Regularly, do the following for all documents
+archive, put it into your inbox. Regulary, do the following for all documents
 in your inbox:
 
 1.  For each document, decide if you need to keep the document in physical
@@ -372,24 +217,18 @@ Once you have scanned in a document, proceed in paperless as follows.
 
 1.  If the document has an ASN, assign the ASN to the document.
 2.  Assign a correspondent to the document (i.e., your employer, bank, etc)
-    This isn't strictly necessary but helps in finding a document when you need
+    This isnt strictly necessary but helps in finding a document when you need
     it.
 3.  Assign a document type (i.e., invoice, bank statement, etc) to the document
-    This isn't strictly necessary but helps in finding a document when you need
+    This isnt strictly necessary but helps in finding a document when you need
     it.
 4.  Assign a proper title to the document (the name of an item you bought, the
     subject of the letter, etc)
-5.  Check that the date of the document is correct. Paperless tries to read
+5.  Check that the date of the document is corrent. Paperless tries to read
     the date from the content of the document, but this fails sometimes if the
     OCR is bad or multiple dates appear on the document.
 6.  Remove inbox tags from the documents.
 
-.. hint::
-
-    You can setup manual matching rules for your correspondents and tags and
-    paperless will assign them automatically. After consuming a couple documents,
-    you can even ask paperless to *learn* when to assign tags and correspondents
-    by itself. For details on this feature, see :ref:`advanced-matching`.
 
 Task management
 ===============

install-paperless-ng.sh

@@ -1,318 +0,0 @@
-#!/bin/bash
-
-ask() {
-	while true ; do
-		if [[ -z $3 ]] ; then
-			read -p "$1 [$2]: " result
-		else
-			read -p "$1 ($3) [$2]: " result
-		fi
-		if [[ -z $result ]]; then
-			ask_result=$2
-			return
-		fi
-		array=$3
-		if [[ -z $3 || " ${array[@]} " =~ " ${result} " ]]; then
-			ask_result=$result
-			return
-		else
-			echo "Invalid option: $result"
-		fi
-	done
-}
-
-ask_docker_folder() {
-	while true ; do
-
-		read -p "$1 [$2]: " result
-
-		if [[ -z $result ]]; then
-			ask_result=$2
-			return
-		fi
-
-		if [[ $result == /* || $result == ./* ]]; then
-			ask_result=$result
-			return
-		else
-			echo "Invalid folder: $result"
-		fi
-
-
-	done
-}
-
-if [[ $(id -u) == "0" ]] ; then
-	echo "Do not run this script as root."
-	exit 1
-fi
-
-if [[ -z $(which wget) ]] ; then
-	echo "wget executable not found. Is wget installed?"
-	exit 1
-fi
-
-if [[ -z $(which docker) ]] ; then
-	echo "docker executable not found. Is docker installed?"
-	exit 1
-fi
-
-if [[ -z $(which docker-compose) ]] ; then
-	echo "docker-compose executable not found. Is docker-compose installed?"
-	exit 1
-fi
-
-# Check if user has permissions to run Docker by trying to get the status of Docker (docker status).
-# If this fails, the user probably does not have permissions for Docker.
-docker stats --no-stream 2>/dev/null 1>&2
-if [ $? -ne 0 ] ; then
-	echo ""
-	echo "WARN: It look like the current user does not have Docker permissions."
-	echo "WARN: Use 'sudo usermod -aG docker $USER' to assign Docker permissions to the user."
-	echo ""
-	sleep 3
-fi
-
-default_time_zone=$(timedatectl show -p Timezone --value)
-
-set -e
-
-echo ""
-echo "############################################"
-echo "###   Paperless-ng docker installation   ###"
-echo "############################################"
-echo ""
-echo "This script will download, configure and start paperless-ng."
-
-echo ""
-echo "1. Folder configuration"
-echo "======================="
-echo ""
-echo "The target folder is used to store the configuration files of "
-echo "paperless. You can move this folder around after installing paperless."
-echo "You will need this folder whenever you want to start, stop, update or "
-echo "maintain your paperless instance."
-echo ""
-
-ask "Target folder" "$(pwd)/paperless-ng"
-TARGET_FOLDER=$ask_result
-
-echo ""
-echo "The consume folder is where paperles will search for new documents."
-echo "Point this to a folder where your scanner is able to put your scanned"
-echo "documents."
-echo ""
-echo "CAUTION: You must specify an absolute path starting with / or a relative "
-echo "path starting with ./ here. Examples:"
-echo "  /mnt/consume"
-echo "  ./consume"
-echo ""
-
-ask_docker_folder "Consume folder" "$TARGET_FOLDER/consume"
-CONSUME_FOLDER=$ask_result
-
-echo ""
-echo "The media folder is where paperless stores your documents."
-echo "Leave empty and docker will manage this folder for you."
-echo "Docker usually stores managed folders in /var/lib/docker/volumes."
-echo ""
-echo "CAUTION: If specified, you must specify an absolute path starting with /"
-echo "or a relative path starting with ./ here."
-echo ""
-
-ask_docker_folder "Media folder" ""
-MEDIA_FOLDER=$ask_result
-
-echo ""
-echo "The data folder is where paperless stores other data, such as your"
-echo "SQLite database (if used), the search index and other data."
-echo "As with the media folder, leave empty to have this managed by docker."
-echo ""
-echo "CAUTION: If specified, you must specify an absolute path starting with /"
-echo "or a relative path starting with ./ here."
-echo ""
-
-ask_docker_folder "Data folder" ""
-DATA_FOLDER=$ask_result
-
-echo ""
-echo "2. Application configuration"
-echo "============================"
-
-echo ""
-echo "The port on which the paperless webserver will listen for incoming"
-echo "connections."
-echo ""
-
-ask "Port" "8000"
-PORT=$ask_result
-
-echo ""
-echo "Paperless requires you to configure the current time zone correctly."
-echo "Otherwise, the dates of your documents may appear off by one day,"
-echo "depending on where you are on earth."
-echo ""
-
-ask "Current time zone" "$default_time_zone"
-TIME_ZONE=$ask_result
-
-echo ""
-echo "Database backend: PostgreSQL and SQLite are available. Use PostgreSQL"
-echo "if unsure. If you're running on a low-power device such as Raspberry"
-echo "Pi, use SQLite to save resources."
-echo ""
-
-ask "Database backend" "postgres" "postgres sqlite"
-DATABASE_BACKEND=$ask_result
-
-echo ""
-echo "Paperless is able to use Apache Tika to support Office documents such as"
-echo "Word, Excel, Powerpoint, and Libreoffice equivalents. This feature"
-echo "requires more resources due to the required services."
-echo ""
-
-ask "Enable Apache Tika?" "no" "yes no"
-TIKA_ENABLED=$ask_result
-
-echo ""
-echo "Specify the default language that most of your documents are written in."
-echo "Use ISO 639-2, (T) variant language codes: "
-echo "https://www.loc.gov/standards/iso639-2/php/code_list.php"
-echo "Common values: eng (English) deu (German) nld (Dutch) fra (French)"
-echo ""
-
-ask "OCR language" "eng"
-OCR_LANGUAGE=$ask_result
-
-echo ""
-echo "Specify the user id and group id you wish to run paperless as."
-echo "Paperless will also change ownership on the data, media and consume"
-echo "folder to the specified values, so it's a good idea to supply the user id"
-echo "and group id of your unix user account."
-echo "If unsure, leave default."
-echo ""
-
-ask "User ID" "$(id -u)"
-USERMAP_UID=$ask_result
-
-ask "Group ID" "$(id -g)"
-USERMAP_GID=$ask_result
-
-echo ""
-echo "3. Login credentials"
-echo "===================="
-echo ""
-echo "Specify initial login credentials. You can change these later."
-echo "A mail address is required, however it is not used in paperless. You don't"
-echo "need to provide an actual mail address."
-echo ""
-
-ask "Paperless username" "$(whoami)"
-USERNAME=$ask_result
-
-while true; do
-	read -sp "Paperless password: " PASSWORD
-	echo ""
-
-	if [[ -z $PASSWORD ]] ; then
-		echo "Password cannot be empty."
-		continue
-	fi
-
-	read -sp "Paperless password (again): " PASSWORD_REPEAT
-	echo ""
-
-	if [[ ! "$PASSWORD" == "$PASSWORD_REPEAT" ]] ; then
-		echo "Passwords did not match"
-	else
-		break
-	fi
-done
-
-ask "Email" "$USERNAME@localhost"
-EMAIL=$ask_result
-
-echo ""
-echo "Summary"
-echo "======="
-echo ""
-
-echo "Target folder: $TARGET_FOLDER"
-echo "Consume folder: $CONSUME_FOLDER"
-if [[ -z $MEDIA_FOLDER ]] ; then
-	echo "Media folder: Managed by docker"
-else
-	echo "Media folder: $MEDIA_FOLDER"
-fi
-if [[ -z $DATA_FOLDER ]] ; then
-	echo "Data folder: Managed by docker"
-else
-	echo "Data folder: $DATA_FOLDER"
-fi
-echo ""
-echo "Port: $PORT"
-echo "Database: $DATABASE_BACKEND"
-echo "Tika enabled: $TIKA_ENABLED"
-echo "OCR language: $OCR_LANGUAGE"
-echo "User id: $USERMAP_UID"
-echo "Group id: $USERMAP_GID"
-echo ""
-echo "Paperless username: $USERNAME"
-echo "Paperless email: $EMAIL"
-
-echo ""
-read -p "Press any key to install."
-
-echo ""
-echo "Installing paperless..."
-echo ""
-
-mkdir -p "$TARGET_FOLDER"
-
-cd "$TARGET_FOLDER"
-
-DOCKER_COMPOSE_VERSION=$DATABASE_BACKEND
-
-if [[ $TIKA_ENABLED == "yes" ]] ; then
-	DOCKER_COMPOSE_VERSION="$DOCKER_COMPOSE_VERSION-tika"
-fi
-
-wget "https://raw.githubusercontent.com/jonaswinkler/paperless-ng/master/docker/compose/docker-compose.$DOCKER_COMPOSE_VERSION.yml" -O docker-compose.yml
-wget "https://raw.githubusercontent.com/jonaswinkler/paperless-ng/master/docker/compose/.env" -O .env
-
-SECRET_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 64 | head -n 1)
-
-DEFAULT_LANGUAGES="deu eng fra ita spa"
-
-{
-	if [[ ! $USERMAP_UID == "1000" ]] ; then
-		echo "USERMAP_UID=$USERMAP_UID"
-	fi
-	if [[ ! $USERMAP_GID == "1000" ]] ; then
-		echo "USERMAP_GID=$USERMAP_GID"
-	fi
-	echo "PAPERLESS_TIME_ZONE=$TIME_ZONE"
-	echo "PAPERLESS_OCR_LANGUAGE=$OCR_LANGUAGE"
-	echo "PAPERLESS_SECRET_KEY=$SECRET_KEY"
-	if [[ ! " ${DEFAULT_LANGUAGES[@]} " =~ " ${OCR_LANGUAGE} " ]] ; then
-		echo "PAPERLESS_OCR_LANGUAGES=$OCR_LANGUAGE"
-	fi
-} > docker-compose.env
-
-sed -i "s/- 8000:8000/- $PORT:8000/g" docker-compose.yml
-
-sed -i "s#- \./consume:/usr/src/paperless/consume#- $CONSUME_FOLDER:/usr/src/paperless/consume#g" docker-compose.yml
-
-if [[ -n $MEDIA_FOLDER ]] ; then
-	sed -i "s#- media:/usr/src/paperless/media#- $MEDIA_FOLDER:/usr/src/paperless/media#g" docker-compose.yml
-fi
-
-if [[ -n $DATA_FOLDER ]] ; then
-	sed -i "s#- data:/usr/src/paperless/data#- $DATA_FOLDER:/usr/src/paperless/data#g" docker-compose.yml
-fi
-
-docker-compose pull
-
-docker-compose run --rm -e DJANGO_SUPERUSER_PASSWORD="$PASSWORD" webserver createsuperuser --noinput --username "$USERNAME" --email "$EMAIL"
-
-docker-compose up -d

paperless.conf.example

@@ -13,7 +13,6 @@
 #PAPERLESS_DBNAME=paperless
 #PAPERLESS_DBUSER=paperless
 #PAPERLESS_DBPASS=paperless
-#PAPERLESS_DBSSLMODE=prefer
 
 # Paths and folders
 
@@ -27,53 +26,31 @@
 
 #PAPERLESS_SECRET_KEY=change-me
 #PAPERLESS_ALLOWED_HOSTS=example.com,www.example.com
-#PAPERLESS_CORS_ALLOWED_HOSTS=http://example.com,http://localhost:8000
+#PAPERLESS_CORS_ALLOWED_HOSTS=localhost:8080,example.com,localhost:8000
 #PAPERLESS_FORCE_SCRIPT_NAME=
 #PAPERLESS_STATIC_URL=/static/
-#PAPERLESS_AUTO_LOGIN_USERNAME=
-#PAPERLESS_COOKIE_PREFIX=
-#PAPERLESS_ENABLE_HTTP_REMOTE_USER=false
-
-# OCR settings
-
-#PAPERLESS_OCR_LANGUAGE=eng
-#PAPERLESS_OCR_MODE=skip
-#PAPERLESS_OCR_OUTPUT_TYPE=pdfa
-#PAPERLESS_OCR_PAGES=1
-#PAPERLESS_OCR_IMAGE_DPI=300
-#PAPERLESS_OCR_CLEAN=clean
-#PAPERLESS_OCR_DESKEW=true
-#PAPERLESS_OCR_ROTATE_PAGES=true
-#PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD=12.0
-#PAPERLESS_OCR_USER_ARGS={}
-#PAPERLESS_CONVERT_MEMORY_LIMIT=0
-#PAPERLESS_CONVERT_TMPDIR=/var/tmp/paperless
 
 # Software tweaks
 
 #PAPERLESS_TASK_WORKERS=1
 #PAPERLESS_THREADS_PER_WORKER=1
 #PAPERLESS_TIME_ZONE=UTC
+#PAPERLESS_OCR_PAGES=1
+#PAPERLESS_OCR_LANGUAGE=eng
+#PAPERLESS_OCR_ALWAYS=false
 #PAPERLESS_CONSUMER_POLLING=10
 #PAPERLESS_CONSUMER_DELETE_DUPLICATES=false
-#PAPERLESS_CONSUMER_RECURSIVE=false
-#PAPERLESS_CONSUMER_IGNORE_PATTERNS=[".DS_STORE/*", "._*", ".stfolder/*"]
-#PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS=false
+#PAPERLESS_CONVERT_MEMORY_LIMIT=0
+#PAPERLESS_CONVERT_TMPDIR=/var/tmp/paperless
+#PAPERLESS_CONVERT_DENSITY=300
 #PAPERLESS_OPTIMIZE_THUMBNAILS=true
 #PAPERLESS_POST_CONSUME_SCRIPT=/path/to/an/arbitrary/script.sh
 #PAPERLESS_FILENAME_DATE_ORDER=YMD
 #PAPERLESS_FILENAME_PARSE_TRANSFORMS=[]
-#PAPERLESS_THUMBNAIL_FONT_NAME=
-#PAPERLESS_IGNORE_DATES=
-
-# Tika settings
-
-#PAPERLESS_TIKA_ENABLED=false
-#PAPERLESS_TIKA_ENDPOINT=http://localhost:9998
-#PAPERLESS_TIKA_GOTENBERG_ENDPOINT=http://localhost:3000
 
 # Binaries
 
 #PAPERLESS_CONVERT_BINARY=/usr/bin/convert
 #PAPERLESS_GS_BINARY=/usr/bin/gs
+#PAPERLESS_UNPAPER_BINARY=/usr/bin/unpaper
 #PAPERLESS_OPTIPNG_BINARY=/usr/bin/optipng

requirements.txt

@@ -1,103 +0,0 @@
-#
-# These requirements were autogenerated by pipenv
-# To regenerate from the project's Pipfile, run:
-#
-#    pipenv lock --requirements
-#
-
--i https://pypi.python.org/simple
---extra-index-url https://www.piwheels.org/simple
-aioredis==1.3.1
-arrow==1.1.1; python_version >= '3.6'
-asgiref==3.4.1; python_version >= '3.6'
-async-timeout==3.0.1; python_full_version >= '3.5.3'
-attrs==21.2.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-autobahn==21.3.1; python_version >= '3.7'
-automat==20.2.0
-backports.zoneinfo==0.2.1
-blessed==1.18.1; python_version >= '2.7'
-certifi==2021.5.30
-cffi==1.14.6
-channels-redis==3.3.0
-channels==3.0.4
-chardet==4.0.0; python_version >= '3.1'
-charset-normalizer==2.0.4; python_version >= '3'
-click==8.0.1; python_version >= '3.6'
-coloredlogs==15.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-concurrent-log-handler==0.9.19
-constantly==15.1.0
-cryptography==3.4.7
-daphne==3.0.2; python_version >= '3.6'
-dateparser==1.0.0
-django-cors-headers==3.8.0
-django-extensions==3.1.3
-django-filter==2.4.0
-django-picklefield==3.0.1; python_version >= '3'
-django-q==1.3.9
-django==3.2.6
-djangorestframework==3.12.4
-filelock==3.0.12
-fuzzywuzzy[speedup]==0.18.0
-gunicorn==20.1.0
-h11==0.12.0; python_version >= '3.6'
-hiredis==2.0.0; python_version >= '3.6'
-httptools==0.2.0
-humanfriendly==9.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-hyperlink==21.0.0
-idna==3.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-imap-tools==0.46.0
-img2pdf==0.4.1
-incremental==21.3.0
-inotify-simple==1.3.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-inotifyrecursive==0.3.5
-joblib==1.0.1; python_version >= '3.6'
-langdetect==1.0.9
-lxml==4.6.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-msgpack==1.0.2
-numpy==1.20.3
-ocrmypdf==12.3.2
-pathvalidate==2.4.1
-pdfminer.six==20201018
-pikepdf==2.16.1
-pillow==8.3.1
-pluggy==0.13.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-portalocker==2.3.0; python_version >= '3'
-psycopg2-binary==2.9.1
-pyasn1-modules==0.2.8
-pyasn1==0.4.8
-pycparser==2.20; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pyopenssl==20.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-python-dateutil==2.8.2
-python-dotenv==0.19.0
-python-gnupg==0.4.7
-python-levenshtein==0.12.2
-python-magic==0.4.24
-pytz==2021.1
-pyyaml==5.4.1
-redis==3.5.3
-regex==2021.8.3
-reportlab==3.6.1; python_version >= '2.7' and python_version < '4'
-requests==2.26.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
-scikit-learn==0.24.0
-scipy==1.7.1; python_version < '3.10' and python_version >= '3.7'
-service-identity==21.1.0
-six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-sortedcontainers==2.4.0
-sqlparse==0.4.1; python_version >= '3.5'
-threadpoolctl==2.2.0; python_version >= '3.6'
-tika==1.24
-tqdm==4.62.1
-twisted[tls]==21.7.0; python_full_version >= '3.6.7'
-txaio==21.2.1; python_version >= '3.6'
-typing-extensions==3.10.0.0
-tzlocal==3.0; python_version >= '3.6'
-urllib3==1.26.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
-uvicorn[standard]==0.15.0
-uvloop==0.16.0
-watchdog==2.1.3
-watchgod==0.7
-wcwidth==0.2.5
-websockets==9.1
-whitenoise==5.3.0
-whoosh==2.7.4
-zope.interface==5.4.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'

resources/logo.txt

@@ -1,16 +0,0 @@
-                         9w
-                       {@@N
-                     Q@@@@H
-                  G@@@@@@@\
-               SilN@@@@@@@
-            *Q  *@@@@@@@@S        /= = = = = = = = = = = = = = = = = =\
-          *@   B@@@@@@@@N        ||                                   ||
- N       R$  A@@@@@@@@@@         ||           PAPERLESS-NG            ||
-x@@     $U  B@@@@@@@@@R          ||                                   ||
-N@@N^   @  N@@@@@@@@@*            \= = = = = = = = = = = = = = = = = =/
-|@@@u   @ E@@@@@@@@l
- Q@@@ \ Px@@@@@@P
-  1@@S`  @@@o'
-    z$  ;
-       v
-      /

scripts/make-release.sh

@@ -0,0 +1,104 @@
+#!/bin/bash
+
+set -e
+
+
+VERSION=$1
+
+if [ -z "$VERSION" ]
+then
+	echo "Need a version string."
+	exit 1
+fi
+
+# source root directory of paperless
+PAPERLESS_ROOT=$(git rev-parse --show-toplevel)
+
+# output directory
+PAPERLESS_DIST="$PAPERLESS_ROOT/dist"
+PAPERLESS_DIST_APP="$PAPERLESS_DIST/paperless-ng"
+PAPERLESS_DIST_DOCKERFILES="$PAPERLESS_DIST/paperless-ng-dockerfiles"
+
+if [ -d "$PAPERLESS_DIST" ]
+then
+	echo "Removing $PAPERLESS_DIST"
+	rm "$PAPERLESS_DIST" -r
+fi
+
+mkdir "$PAPERLESS_DIST"
+mkdir "$PAPERLESS_DIST_APP"
+mkdir "$PAPERLESS_DIST_APP/docker"
+mkdir "$PAPERLESS_DIST_DOCKERFILES"
+
+# setup dependencies.
+
+cd "$PAPERLESS_ROOT"
+
+pipenv clean
+pipenv install --dev
+pipenv lock --keep-outdated -r > "$PAPERLESS_DIST_APP/requirements.txt"
+
+# test if the application works.
+
+cd "$PAPERLESS_ROOT/src"
+pipenv run pytest --cov
+pipenv run pycodestyle
+
+# make the documentation.
+
+cd "$PAPERLESS_ROOT/docs"
+make clean html
+
+# copy stuff into place
+
+# the application itself
+
+cp "$PAPERLESS_ROOT/.env" \
+  "$PAPERLESS_ROOT/.dockerignore" \
+	"$PAPERLESS_ROOT/CONTRIBUTING.md" \
+	"$PAPERLESS_ROOT/LICENSE" \
+	"$PAPERLESS_ROOT/Pipfile" \
+	"$PAPERLESS_ROOT/Pipfile.lock" \
+	"$PAPERLESS_ROOT/README.md" "$PAPERLESS_DIST_APP"
+
+cp "$PAPERLESS_ROOT/paperless.conf.example" "$PAPERLESS_DIST_APP/paperless.conf"
+
+# copy python source, templates and static files.
+cd "$PAPERLESS_ROOT"
+find src -wholename '*/templates/*' -o -wholename '*/static/*' -o -name '*.py' | cpio -pdm "$PAPERLESS_DIST_APP"
+
+# build the front end.
+
+cd "$PAPERLESS_ROOT/src-ui"
+ng build --prod --output-hashing none --sourceMap=false --output-path "$PAPERLESS_DIST_APP/src/documents/static/frontend"
+
+# documentation
+cp "$PAPERLESS_ROOT/docs/_build/html/" "$PAPERLESS_DIST_APP/docs" -r
+
+# docker files for building the image yourself
+cp "$PAPERLESS_ROOT/docker/local/"* "$PAPERLESS_DIST_APP"
+cp "$PAPERLESS_ROOT/docker/docker-compose.env" "$PAPERLESS_DIST_APP"
+
+# docker files for pulling from docker hub
+cp "$PAPERLESS_ROOT/docker/hub/"* "$PAPERLESS_DIST_DOCKERFILES"
+cp "$PAPERLESS_ROOT/.env" "$PAPERLESS_DIST_DOCKERFILES"
+cp "$PAPERLESS_ROOT/docker/docker-compose.env" "$PAPERLESS_DIST_DOCKERFILES"
+
+# auxiliary files required for the docker image
+cp "$PAPERLESS_ROOT/docker/docker-entrypoint.sh" "$PAPERLESS_DIST_APP/docker/"
+cp "$PAPERLESS_ROOT/docker/gunicorn.conf.py" "$PAPERLESS_DIST_APP/docker/"
+cp "$PAPERLESS_ROOT/docker/imagemagick-policy.xml" "$PAPERLESS_DIST_APP/docker/"
+cp "$PAPERLESS_ROOT/docker/supervisord.conf" "$PAPERLESS_DIST_APP/docker/"
+
+# try to make the docker build.
+
+cd "$PAPERLESS_DIST_APP"
+
+docker build . -t "jonaswinkler/paperless-ng:$VERSION"
+
+# works. package the app!
+
+cd "$PAPERLESS_DIST"
+
+tar -cJf "paperless-ng-$VERSION.tar.xz" paperless-ng/
+tar -cJf "paperless-ng-$VERSION-dockerfiles.tar.xz" paperless-ng-dockerfiles/

scripts/paperless-consumer.service

@@ -1,12 +1,10 @@
 [Unit]
 Description=Paperless consumer
-Requires=redis.service
 
 [Service]
 User=paperless
 Group=paperless
-WorkingDirectory=/opt/paperless/src
-ExecStart=python3 manage.py document_consumer
+ExecStart=/home/paperless/project/virtualenv/bin/python /home/paperless/project/src/manage.py document_consumer
 
 [Install]
 WantedBy=multi-user.target

scripts/paperless-scheduler.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Paperless scheduler
-Requires=redis.service
-
-[Service]
-User=paperless
-Group=paperless
-WorkingDirectory=/opt/paperless/src
-ExecStart=python3 manage.py qcluster
-
-[Install]
-WantedBy=multi-user.target

scripts/paperless-webserver.service

@@ -2,13 +2,11 @@
 Description=Paperless webserver
 After=network.target
 Wants=network.target
-Requires=redis.service
 
 [Service]
 User=paperless
 Group=paperless
-WorkingDirectory=/opt/paperless/src
-ExecStart=/opt/paperless/.local/bin/gunicorn -c /opt/paperless/gunicorn.conf.py paperless.asgi:application
+ExecStart=/home/paperless/project/virtualenv/bin/gunicorn --pythonpath=/home/paperless/project/src paperless.wsgi -w 2
 
 [Install]
 WantedBy=multi-user.target

scripts/push-release.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+
+VERSION=$1
+
+if [ -z "$VERSION" ]
+then
+	echo "Need a version string."
+	exit 1
+fi
+
+# source root directory of paperless
+PAPERLESS_ROOT=$(git rev-parse --show-toplevel)
+
+# output directory
+PAPERLESS_DIST="$PAPERLESS_ROOT/dist"
+PAPERLESS_DIST_APP="$PAPERLESS_DIST/paperless-ng"
+
+cd "$PAPERLESS_DIST_APP"
+
+docker push "jonaswinkler/paperless-ng:$VERSION"

scripts/start_services.sh

@@ -1,4 +1,2 @@
-docker run -p 5432:5432 -e POSTGRES_PASSWORD=password -v paperless_pgdata:/var/lib/postgresql/data -d postgres:13
+docker run -p 5432:5432 -v paperless_pgdata:/var/lib/postgresql/data -d postgres:13
 docker run -d -p 6379:6379 redis:latest
-docker run -p 3000:3000 -d gotenberg/gotenberg:7
-docker run -p 9998:9998 -d apache/tika

src-ui/angular.json

@@ -13,24 +13,6 @@
 			"root": "",
 			"sourceRoot": "src",
 			"prefix": "app",
-			"i18n": {
-				"sourceLocale": "en-US",
-				"locales": {
-					"de-DE": "src/locale/messages.de_DE.xlf",
-					"nl-NL": "src/locale/messages.nl_NL.xlf",
-					"fr-FR": "src/locale/messages.fr_FR.xlf",
-					"en-GB": "src/locale/messages.en_GB.xlf",
-					"pt-BR": "src/locale/messages.pt_BR.xlf",
-					"pt-PT": "src/locale/messages.pt_PT.xlf",
-					"it-IT": "src/locale/messages.it_IT.xlf",
-					"ro-RO": "src/locale/messages.ro_RO.xlf",
-					"ru-RU": "src/locale/messages.ru_RU.xlf",
-					"es-ES": "src/locale/messages.es_ES.xlf",
-					"pl-PL": "src/locale/messages.pl_PL.xlf",
-					"sv-SE": "src/locale/messages.sv_SE.xlf",
-					"lb-LU": "src/locale/messages.lb_LU.xlf"
-				}
-			},
 			"architect": {
 				"build": {
 					"builder": "@angular-devkit/build-angular:browser",
@@ -41,25 +23,15 @@
 						"main": "src/main.ts",
 						"polyfills": "src/polyfills.ts",
 						"tsConfig": "tsconfig.app.json",
-						"localize": true,
 						"aot": true,
 						"assets": [
 							"src/favicon.ico",
-							"src/apple-touch-icon.png",
-							"src/assets",
-							"src/manifest.webmanifest", {
-								"glob": "pdf.worker.min.js",
-								"input": "node_modules/pdfjs-dist/build/",
-								"output": "/assets/js/"
-							}
+							"src/assets"
 						],
 						"styles": [
 							"src/styles.scss"
 						],
-						"scripts": [],
-						"allowedCommonJsDependencies": [
-							"ng2-pdf-viewer"
-						]
+						"scripts": []
 					},
 					"configurations": {
 						"production": {
@@ -69,10 +41,10 @@
 									"with": "src/environments/environment.prod.ts"
 								}
 							],
-							"outputPath": "../src/documents/static/frontend/",
 							"optimization": true,
 							"outputHashing": "none",
 							"sourceMap": false,
+							"extractCss": true,
 							"namedChunks": false,
 							"extractLicenses": true,
 							"vendorChunk": false,
@@ -89,16 +61,13 @@
 									"maximumError": "10kb"
 								}
 							]
-						},
-						"en-US": {
-							"localize": ["en-US"]
 						}
 					}
 				},
 				"serve": {
 					"builder": "@angular-devkit/build-angular:dev-server",
 					"options": {
-						"browserTarget": "paperless-ui:build:en-US"
+						"browserTarget": "paperless-ui:build"
 					},
 					"configurations": {
 						"production": {
@@ -109,8 +78,7 @@
 				"extract-i18n": {
 					"builder": "@angular-devkit/build-angular:extract-i18n",
 					"options": {
-						"browserTarget": "paperless-ui:build",
-						"ivy": true
+						"browserTarget": "paperless-ui:build"
 					}
 				},
 				"test": {
@@ -122,9 +90,7 @@
 						"karmaConfig": "karma.conf.js",
 						"assets": [
 							"src/favicon.ico",
-							"src/apple-touch-icon.png",
-							"src/assets",
-							"src/manifest.webmanifest"
+							"src/assets"
 						],
 						"styles": [
 							"src/styles.scss"
@@ -161,4 +127,4 @@
 		}
 	},
 	"defaultProject": "paperless-ui"
-}
+}

src-ui/e2e/protractor.conf.js

@@ -33,4 +33,4 @@ exports.config = {
       }
     }));
   }
-};
+};