Split paperless and sftp

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "images/rpi-paperless"]
 	path = images/rpi-paperless
 	url = git@github.com:bingen/rpi-paperless.git
+[submodule "images/rpi-sftp"]
+	path = images/rpi-sftp
+	url = git@github.com:bingen/rpi-sftp.git

docker-compose.yml

@@ -138,17 +138,34 @@ services:
       - ${NEXTCLOUD_DATA_VOLUME_PATH}:${NEXTCLOUD_DATA_PATH}
       - ${NEXTCLOUD_BACKUP_VOLUME_PATH}:${NEXTCLOUD_BACKUP_PATH}
 
+  sftp:
+    build:
+      context: ./images/rpi-sftp/
+    image: bingen/rpi-sftp
+    ports:
+      - "1022:22"
+    volumes:
+      - ${PAPERLESS_CONSUMPTION_VOLUME_PATH}:${PAPERLESS_CONSUMPTION_PATH}
+    secrets:
+      - source: paperless_ftp_pwd
+        target: ftp_pwd
+        uid: '999'
+        mode: 0440
+    env_file:
+      - sftp.env
+
   paperless:
     build:
       context: ./images/rpi-paperless/
     image: bingen/rpi-paperless
+    depends_on:
+      - sftp
     ports:
       - "8081:8000"
-      - "1022:22"
     volumes:
+      - ${PAPERLESS_CONSUMPTION_VOLUME_PATH}:${PAPERLESS_CONSUMPTION_PATH}
       - ${PAPERLESS_DATA_VOLUME_PATH}:/usr/src/paperless/data
       - ${PAPERLESS_MEDIA_VOLUME_PATH}:/usr/src/paperless/media
-      - ${PAPERLESS_CONSUMPTION_VOLUME_PATH}:${PAPERLESS_CONSUMPTION_PATH}
       - ${PAPERLESS_EXPORT_VOLUME_PATH}:${PAPERLESS_EXPORT_PATH}
     secrets:
       - source: paperless_webserver_pwd
@@ -159,10 +176,6 @@ services:
         target: passphrase
         uid: '999'
         mode: 0440
-      - source: paperless_ftp_pwd
-        target: ftp_pwd
-        uid: '999'
-        mode: 0440
     env_file:
       - paperless.env
 

images/rpi-sftp

@@ -0,0 +1 @@
+Subproject commit 44fc6acac78dfe872ca53be1eee4a70d21d3a279

paperless.env.template

@@ -7,6 +7,3 @@ PAPERLESS_PASSPHRASE_FILE=/run/secrets/passphrase
 PAPERLESS_OCR_LANGUAGES=cat spa
 #USERMAP_UID=
 #USERMAP_GID=
-# FTP server
-PAPERLESS_FTP_USER=${PAPERLESS_FTP_USER}
-PAPERLESS_FTP_PWD_FILE=/run/secrets/ftp_pwd

setup.sh

@@ -79,12 +79,12 @@ if [[ ${#paperless_passphrase} -eq 0 ]]; then
     paperless_=`eval "$PWD_GEN"`
 fi
 
-read -p "Paperless FTP User (consume): " paperless_ftp_user
+read -p "SFTP User - SFTP server is used by paperless (consume): " paperless_ftp_user
 if [[ ${#paperless_ftp_user} -eq 0 ]]; then
     paperless_ftp_user=consume
 fi
 
-read -p "Paperless FTP Pwd (a random one will be generated if empty): " paperless_ftp_pwd
+read -p "SFTP Pwd (a random one will be generated if empty): " paperless_ftp_pwd
 if [[ ${#paperless_ftp_pwd} -eq 0 ]]; then
     paperless_ftp_pwd=`eval "$PWD_GEN"`
 fi
@@ -101,7 +101,7 @@ echo Your LDAP Mail Bind DN Uid is:        $ldap_mail_uid
 echo Your LDAP Nextcloud Bind DN Uid is:   $ldap_nextcloud_uid
 echo Your Let\'s Encrypt account e-mail:   $letsencrypt_email
 echo Your Paperless Web Server User:       $paperless_webserver_user
-echo Your Paperless FTP User:              $paperless_ftp_user
+echo Your SFTP User:                       $paperless_ftp_user
 
 echo $'\E[1;37m'
 read -p "Are These Settings Correct? Yes (y), No (n): " confirm
@@ -137,6 +137,7 @@ cp mail.env.template mail.env
 cp nextcloud.env.template nextcloud.env
 cp haproxy.env.template haproxy.env
 cp paperless.env.template paperless.env
+cp sftp.env.template sftp.env
 
 for i in `ls *.env .env`; do
     sed -i "s/\${DOMAIN}/${domain}/g" $i
@@ -158,8 +159,9 @@ echo "\nMAIL_DATA_PATH=${MAIL_DATA_PATH}" >> mail.env
 echo "\nNEXTCLOUD_DB_BACKUP=${NEXTCLOUD_DATA_PATH}/nextcloud_db_backup.sql" >> nextcloud.env
 echo "\nNEXTCLOUD_DATA_PATH=${NEXTCLOUD_DATA_PATH}" >> nextcloud.env
 echo "\nNEXTCLOUD_BACKUP_PATH=${NEXTCLOUD_BACKUP_PATH}" >> nextcloud.env
-echo "\nPAPERLESS_CONSUMPTION_DIR=${PAPERLESS_CONSUPTION_PATH}" >> paperless.env
+echo "\nPAPERLESS_CONSUMPTION_DIR=${PAPERLESS_CONSUMPTION_PATH}" >> paperless.env
 echo "\nPAPERLESS_EXPORT_DIR=${PAPERLESS_EXPORT_PATH}" >> paperless.env
+echo "\nPAPERLESS_CONSUMPTION_DIR=${PAPERLESS_CONSUMPTION_PATH}" >> sftp.env
 
 echo $'\E[33m'
 echo "//////////////////////////////////////////////////"

sftp.env.template

@@ -0,0 +1,3 @@
+# FTP server
+PAPERLESS_FTP_USER=${PAPERLESS_FTP_USER}
+PAPERLESS_FTP_PWD_FILE=/run/secrets/ftp_pwd