From 658266ddf07bb750927275639f64141a2c7b83e5 Mon Sep 17 00:00:00 2001
From: Russ Poetker <rpoetke1@jh.edu>
Date: Thu, 2 Nov 2023 12:01:59 -0400
Subject: [PATCH] Change test ftp service to sftp

---
 .eclipse-pass.local_env           |  8 ++++----
 deposit/deposit-repositories.json |  7 ++-----
 docker-compose-deposit.yml        | 17 +++++++----------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.eclipse-pass.local_env b/.eclipse-pass.local_env
index f0fe9105..64318c13 100644
--- a/.eclipse-pass.local_env
+++ b/.eclipse-pass.local_env
@@ -36,10 +36,10 @@ DSPACE_SERVER=dspace:8080
 DSPACE_USER=test@test.edu
 DSPACE_PASSWORD=admin
 
-PMC_FTP_HOST=pmc-ftp-server
-PMC_FTP_PORT=21
-PMC_FTP_USER=nihmsftpuser
-PMC_FTP_PASSWORD=nihmsftppass
+PMC_FTP_HOST=pmc-sftp-server
+PMC_FTP_PORT=22
+PMC_FTP_USER=pmcsftpuser
+PMC_FTP_PASSWORD=pmcsftppass
 
 ###################################################
 # Auth / Proxy config #############################
diff --git a/deposit/deposit-repositories.json b/deposit/deposit-repositories.json
index 7c1be3e5..63d14256 100644
--- a/deposit/deposit-repositories.json
+++ b/deposit/deposit-repositories.json
@@ -70,15 +70,12 @@
     },
     "transport-config": {
       "protocol-binding": {
-        "protocol": "ftp",
+        "protocol": "sftp",
         "username": "${pmc.ftp.user}",
         "password": "${pmc.ftp.password}",
         "server-fqdn": "${pmc.ftp.host}",
         "server-port": "${pmc.ftp.port}",
-        "data-type": "binary",
-        "transfer-mode": "stream",
-        "use-pasv": true,
-        "default-directory": "/logs/upload/test/%s"
+        "default-directory": "/upload/%s"
       }
     }
   }
diff --git a/docker-compose-deposit.yml b/docker-compose-deposit.yml
index bc0c2810..455711a2 100644
--- a/docker-compose-deposit.yml
+++ b/docker-compose-deposit.yml
@@ -30,19 +30,16 @@ services:
     volumes:
       - ./deposit/deposit-repositories.json:/deposit/deposit-repositories.json
 
-  pmc-ftp-server:
-    container_name: pmc-ftp-server
-    environment:
-      - FTP_USER=nihmsftpuser
-      - FTP_PASS=nihmsftppass
-    image: fauria/vsftpd
+  pmc-sftp-server:
+    container_name: pmc-sftp-server
+    image: atmoz/sftp
     ports:
-      - '20-21:20-21/tcp'
-      - '40000-40009:40000-40009/tcp'
+      - '2222:22/tcp'
     networks:
       - back
     volumes:
-      - ftpdata:/home/user
+      - sftpdata:/home/pmcsftpuser
+    command: pmcsftpuser:pmcsftppass:::upload
 
 volumes:
-  ftpdata:
+  sftpdata: