From bac8849f2d749d7fe3a39aa9d02a1c9bbb3dd157 Mon Sep 17 00:00:00 2001 From: Kim Date: Fri, 11 Mar 2022 09:39:01 +0100 Subject: [PATCH 1/2] Use main instead of master branch in install URL --- docs/setup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup.rst b/docs/setup.rst index bd8421fe4..3e80a72e0 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -110,7 +110,7 @@ performs all the steps described in :ref:`setup-docker_hub` automatically. .. code:: shell-session - $ bash -c "$(curl -L https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/master/install-paperless-ngx.sh)" + $ bash -c "$(curl -L https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/main/install-paperless-ngx.sh)" .. _setup-docker_hub: From bd374f4c36c499af9dd5c2bc3e322c9905af8629 Mon Sep 17 00:00:00 2001 From: Kim Date: Fri, 11 Mar 2022 09:45:44 +0100 Subject: [PATCH 2/2] Also update other occurrences of master branch to main --- README.md | 2 +- install-paperless-ngx.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e7b27d855..80af93fc1 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ The easiest way to deploy paperless is docker-compose. The files in the [`/docke If you'd like to jump right in, you can configure a docker-compose environment with our install script: ```bash -bash -c "$(curl -L https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/master/install-paperless-ngx.sh)" +bash -c "$(curl -L https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/main/install-paperless-ngx.sh)" ``` Alternatively, you can install the dependencies and setup apache and a database server yourself. The [documentation](https://paperless-ngx.readthedocs.io/en/latest/setup.html#installation) has a step by step guide on how to do it. diff --git a/install-paperless-ngx.sh b/install-paperless-ngx.sh index 938598bf1..8cb45b361 100755 --- a/install-paperless-ngx.sh +++ b/install-paperless-ngx.sh @@ -301,8 +301,8 @@ if [[ $TIKA_ENABLED == "yes" ]] ; then DOCKER_COMPOSE_VERSION="$DOCKER_COMPOSE_VERSION-tika" fi -wget "https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/master/docker/compose/docker-compose.$DOCKER_COMPOSE_VERSION.yml" -O docker-compose.yml -wget "https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/master/docker/compose/.env" -O .env +wget "https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/main/docker/compose/docker-compose.$DOCKER_COMPOSE_VERSION.yml" -O docker-compose.yml +wget "https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/main/docker/compose/.env" -O .env SECRET_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 64 | head -n 1)