From 374ce47fcde9ed84b1d9182c09e53aa8559a9a7b Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Mon, 28 Feb 2022 07:45:43 -0800 Subject: [PATCH 1/4] Swap Folder and Application config steps --- install-paperless-ngx.sh | 104 +++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/install-paperless-ngx.sh b/install-paperless-ngx.sh index 48a49397a..aa8b0f8b0 100755 --- a/install-paperless-ngx.sh +++ b/install-paperless-ngx.sh @@ -85,58 +85,7 @@ echo "" echo "This script will download, configure and start paperless-ngx." 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-ngx" -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 "1. Application configuration" echo "============================" echo "" @@ -199,6 +148,57 @@ USERMAP_UID=$ask_result ask "Group ID" "$(id -g)" USERMAP_GID=$ask_result +echo "" +echo "2. 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-ngx" +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 "3. Login credentials" echo "====================" From 3493f4da7ba922b49b20d7c4df9a67ab97730ee9 Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Mon, 28 Feb 2022 07:52:01 -0800 Subject: [PATCH 2/4] Use $DATABASE_BACKEND to echo SQLite or not --- install-paperless-ngx.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/install-paperless-ngx.sh b/install-paperless-ngx.sh index aa8b0f8b0..70027db31 100755 --- a/install-paperless-ngx.sh +++ b/install-paperless-ngx.sh @@ -189,7 +189,10 @@ 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." +if [[ "$DATABASE_BACKEND" == "sqlite" ]] + echo -n "SQLite database, the " +fi +echo "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 /" From 80d05add03ae39bc7416bcaf8e70dec7d69525ed Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Mon, 28 Feb 2022 08:07:57 -0800 Subject: [PATCH 3/4] Ask for database folder is using postgres --- install-paperless-ngx.sh | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/install-paperless-ngx.sh b/install-paperless-ngx.sh index 70027db31..c9de960fe 100755 --- a/install-paperless-ngx.sh +++ b/install-paperless-ngx.sh @@ -189,7 +189,7 @@ MEDIA_FOLDER=$ask_result echo "" echo "The data folder is where paperless stores other data, such as your" -if [[ "$DATABASE_BACKEND" == "sqlite" ]] +if [[ "$DATABASE_BACKEND" == "sqlite" ]] ; then echo -n "SQLite database, the " fi echo "search index and other data." @@ -202,6 +202,19 @@ echo "" ask_docker_folder "Data folder" "" DATA_FOLDER=$ask_result +if [[ "$DATABASE_BACKEND" == "postgres" ]] ; then + echo "" + echo "The database folder, where postgres stores its data." + echo "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 "Database folder" "" + POSTGRES_FOLDER=$ask_result +fi + echo "" echo "3. Login credentials" echo "====================" @@ -253,6 +266,13 @@ if [[ -z $DATA_FOLDER ]] ; then else echo "Data folder: $DATA_FOLDER" fi +if [[ "$DATABASE_BACKEND" == "postgres" ]] ; then + if [[ -z $POSTGRES_FOLDER ]] ; then + echo "Database (postgres) folder: Managed by docker" + else + echo "Database (postgres) folder: $POSTGRES_FOLDER" + fi +fi echo "" echo "Port: $PORT" echo "Database: $DATABASE_BACKEND" @@ -315,8 +335,12 @@ 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 +if [[ -n $POSTGRES_FOLDER ]] ; then + sed -i "s#- pgdata:/var/lib/postgresql/data#- $POSTGRES_FOLDER:/var/lib/postgresql/data#g" docker-compose.yml +fi -docker-compose run --rm -e DJANGO_SUPERUSER_PASSWORD="$PASSWORD" webserver createsuperuser --noinput --username "$USERNAME" --email "$EMAIL" +# docker-compose pull -docker-compose up -d +# docker-compose run --rm -e DJANGO_SUPERUSER_PASSWORD="$PASSWORD" webserver createsuperuser --noinput --username "$USERNAME" --email "$EMAIL" + +# docker-compose up -d From 5bfadc2147175430013602a0ff48b00b2d76232b Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Mon, 28 Feb 2022 08:18:50 -0800 Subject: [PATCH 4/4] Remove comment used for testing --- install-paperless-ngx.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install-paperless-ngx.sh b/install-paperless-ngx.sh index c9de960fe..e8a046c40 100755 --- a/install-paperless-ngx.sh +++ b/install-paperless-ngx.sh @@ -339,8 +339,8 @@ if [[ -n $POSTGRES_FOLDER ]] ; then sed -i "s#- pgdata:/var/lib/postgresql/data#- $POSTGRES_FOLDER:/var/lib/postgresql/data#g" docker-compose.yml fi -# docker-compose pull +docker-compose pull -# docker-compose run --rm -e DJANGO_SUPERUSER_PASSWORD="$PASSWORD" webserver createsuperuser --noinput --username "$USERNAME" --email "$EMAIL" +docker-compose run --rm -e DJANGO_SUPERUSER_PASSWORD="$PASSWORD" webserver createsuperuser --noinput --username "$USERNAME" --email "$EMAIL" -# docker-compose up -d +docker-compose up -d