diff --git a/debian-box/docker/Dockerfile-8 b/debian-box/docker/Dockerfile-8 index d0185fe..a461dcb 100644 --- a/debian-box/docker/Dockerfile-8 +++ b/debian-box/docker/Dockerfile-8 @@ -25,7 +25,10 @@ RUN apt-get update \ nano \ dnsutils \ mysql-client \ - postgresql-client + postgresql-client \ + nmap \ + telnet \ + netcat RUN export GCSFUSE_REPO=gcsfuse-jessie \ && echo "deb http://packages.cloud.google.com/apt $GCSFUSE_REPO main" | sudo tee /etc/apt/sources.list.d/gcsfuse.list \ diff --git a/secure_emailing/README.md b/secure_emailing/README.md index 83e7806..eb9e4d0 100644 --- a/secure_emailing/README.md +++ b/secure_emailing/README.md @@ -21,7 +21,7 @@ Based on: https://github.com/bcoe/secure-smtpd | Relay email | // tcpdump -i eth0 'port 25' --------------- ^ - | Port: 25 + | Port: 25 | ---------------- -------------- | Secure email | <---- Port: 5432 -------> | PostgreSQL | diff --git a/secure_emailing/docker/common/smtp_proxy_v2/credentials_emailing.py b/secure_emailing/docker/common/smtp_proxy_v2/credentials_emailing.py index 2f3536f..ad42bff 100644 --- a/secure_emailing/docker/common/smtp_proxy_v2/credentials_emailing.py +++ b/secure_emailing/docker/common/smtp_proxy_v2/credentials_emailing.py @@ -12,7 +12,7 @@ def data_pg(self, username, password): self.username = username self.password = password - # Conf database + # Conf database parser = SafeConfigParser() parser.read('emailing.conf') self.db_name = parser.get('POSTGRES', 'db_name') diff --git a/sftp-multiuser/docker/files/start.sh b/sftp-multiuser/docker/files/start.sh index 8eab08c..3de3c4d 100755 --- a/sftp-multiuser/docker/files/start.sh +++ b/sftp-multiuser/docker/files/start.sh @@ -21,7 +21,6 @@ function fun_check_user { chmod 775 -R $DIR # SSH authorized_keys mkdir -p $DIR/.ssh - touch $DIR/.ssh chmod 700 -R $DIR/.ssh chmod 600 -R $DIR/.ssh/authorized_keys chown $OWNER:$USER -R $DIR