From c26fffd401ba63b8c9a222165c91602b0a6b3e13 Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Wed, 11 Nov 2020 14:38:46 +0100
Subject: [PATCH] update sftp ports
---
README.md | 4 ++--
docker-compose.dem.yml | 2 +-
docker-compose.emg.yml | 2 +-
documentation/operator-guide/management.rst | 2 +-
testing/registrar_test.py | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index c2cd9c2a..dd15e52f 100644
--- a/README.md
+++ b/README.md
@@ -180,7 +180,7 @@ The following services are defined via docker compose files.
* uses external atmoz/sftp image
* provides sftp access to two volumes for report exchange on registration result xmls and ingest requirement xmls
-* accessible on swarm master on port 2222
+* accessible on swarm master on port 2222-22xx
* credentials supplied via config
# Usage
@@ -304,7 +304,7 @@ On production machine, `fluentd` is set as a logging driver for docker daemon by
The `SFTP` image allow remote access into 2 logging folders, you can define (edit/add) users, passwords and (UID/GID) using `docker config create` mentioned above.
-In the below example the username is `eox`, once the stack is deployed you can sftp into the logging folders through port 2222 on -if you are running the dev stack- localhost :
+In the below example the username is `eox`, once the stack is deployed you can sftp into the logging folders through port 2222 (for ``vhr18``, ``emg`` and ``dem`` have 2223 and 2224 respectively) if you are running the dev stack localhost :
```bash
sftp -P 2222 eox@127.0.0.1
diff --git a/docker-compose.dem.yml b/docker-compose.dem.yml
index 455cbe09..fc4b355f 100644
--- a/docker-compose.dem.yml
+++ b/docker-compose.dem.yml
@@ -185,7 +185,7 @@ services:
- source: sftp_users_dem
target: /etc/sftp/users.conf
ports:
- - "2222:22"
+ - "2224:22"
deploy:
replicas: 1
ingestor:
diff --git a/docker-compose.emg.yml b/docker-compose.emg.yml
index bbcf9602..06da6329 100644
--- a/docker-compose.emg.yml
+++ b/docker-compose.emg.yml
@@ -196,7 +196,7 @@ services:
target: /etc/sftp/users.conf
ports:
- - "2222:22"
+ - "2223:22"
deploy:
replicas: 1
configs:
diff --git a/documentation/operator-guide/management.rst b/documentation/operator-guide/management.rst
index 40fa410b..181866b9 100644
--- a/documentation/operator-guide/management.rst
+++ b/documentation/operator-guide/management.rst
@@ -63,7 +63,7 @@ Inspecting reports
------------------
Once a product is registered, a xml report containing wcs and wms getcapabilities of the registered product is generated and can be accessed by connecting to the `SFTP` service via the sftp protocol.
-In order to log into the logging folders through port 2222 on the hosting ip (e.g. localhost if you are running the dev stack) The following command can be used:
+In order to log into the logging folders through port 2222 (for ``vhr18``, ``emg`` and ``dem`` have 2223 and 2224 respectively) on the hosting ip (e.g. localhost if you are running the dev stack) The following command can be used:
.. code-block:: bash
diff --git a/testing/registrar_test.py b/testing/registrar_test.py
index b53da07c..5a8397f3 100644
--- a/testing/registrar_test.py
+++ b/testing/registrar_test.py
@@ -34,7 +34,7 @@ def identifiers():
def sftp_connection():
username = os.environ['sftp_users_emg'].split(':')[0]
password = os.environ['sftp_users_emg'].split(':')[1]
- transport = paramiko.Transport(('docker', 2222))
+ transport = paramiko.Transport(('docker', 2223))
transport.connect(username=username, password=password)
with paramiko.SFTPClient.from_transport(transport) as sftp:
yield sftp
--
GitLab