From cdfc82cf3f655513b3489f9b92695cc3417c2807 Mon Sep 17 00:00:00 2001
From: Danny Houtworm <code@houtworm.email>
Date: Mon, 14 Aug 2023 01:23:48 +0000
Subject: [PATCH] bla

---
 srcs/.env                             | 2 ++
 srcs/docker-compose.yml               | 7 +++++++
 srcs/requirements/fail2ban/Dockerfile | 6 ++++++
 srcs/requirements/ftp/Dockerfile      | 9 ++++-----
 srcs/requirements/ftp/srcs/start.sh   | 3 +++
 srcs/requirements/mariadb/Dockerfile  | 1 -
 6 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 srcs/requirements/fail2ban/Dockerfile
 create mode 100644 srcs/requirements/ftp/srcs/start.sh

diff --git a/srcs/.env b/srcs/.env
index 7923a14..9d2a693 100644
--- a/srcs/.env
+++ b/srcs/.env
@@ -7,3 +7,5 @@ WPADMINEMAIL=danny@houtworm.email
 WPUSERUSER=user42
 WPUSERPASSWD=password
 WPUSEREMAIL=user42@houtworm.email
+FTPUSER=djonker
+FTPPASSWD=password
diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml
index 5d8aab8..4e96403 100644
--- a/srcs/docker-compose.yml
+++ b/srcs/docker-compose.yml
@@ -53,6 +53,9 @@ services:
        ipv4_address: 172.20.30.30
   ftp:
     build: ./requirements/ftp
+    environment:
+      - FTPUSER=${FTPUSER}
+      - FTPPASSWD=${FTPPASSWD}
     container_name: ftp
     restart: always
     volumes:
@@ -76,6 +79,10 @@ services:
     networks:
       wordpress:
        ipv4_address: 172.20.30.50
+  fail2ban:
+    build: ./requirements/fail2ban
+    container_name: fail2ban
+    restart: always
 
 networks:
   wordpress:
diff --git a/srcs/requirements/fail2ban/Dockerfile b/srcs/requirements/fail2ban/Dockerfile
new file mode 100644
index 0000000..aa7e066
--- /dev/null
+++ b/srcs/requirements/fail2ban/Dockerfile
@@ -0,0 +1,6 @@
+FROM alpine
+RUN sleep 10
+RUN apk update
+RUN apk add fail2ban
+WORKDIR /root/
+CMD sleep 1000000
diff --git a/srcs/requirements/ftp/Dockerfile b/srcs/requirements/ftp/Dockerfile
index ed8760a..505a1de 100644
--- a/srcs/requirements/ftp/Dockerfile
+++ b/srcs/requirements/ftp/Dockerfile
@@ -1,13 +1,12 @@
 FROM alpine
+ARG FTPUSER=${FTPUSER}
+ARG FTPPASSWD=${FTPPASSWD}
 RUN sleep 10
 RUN apk update
 RUN apk add openssl
 RUN apk add pure-ftpd
+COPY srcs/start.sh /root/start.sh
 WORKDIR /root/
-COPY srcs/pure-ftpd.conf /etc/pure-ftp.conf
-RUN adduser --disabled-password admin
-RUN echo "admin:password" | chpasswd
-CMD pure-ftpd -p 21000:21000 -P 127.0.0.1
+CMD sh start.sh
 EXPOSE 21/tcp
-EXPOSE 20/tcp
 EXPOSE 21000/tcp
diff --git a/srcs/requirements/ftp/srcs/start.sh b/srcs/requirements/ftp/srcs/start.sh
new file mode 100644
index 0000000..7a51503
--- /dev/null
+++ b/srcs/requirements/ftp/srcs/start.sh
@@ -0,0 +1,3 @@
+adduser --disabled-password ${FTPUSER}
+echo "${FTPUSER:${FTPPASSWD}}" | chpasswd
+pure-ftpd -p 21000:21000 -P 127.0.0.1
diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile
index e3fc1e7..83b952d 100644
--- a/srcs/requirements/mariadb/Dockerfile
+++ b/srcs/requirements/mariadb/Dockerfile
@@ -8,7 +8,6 @@ RUN apk add mariadb
 RUN apk add mariadb-client
 COPY srcs/start.sh /root/start.sh
 COPY srcs/my.cnf /etc/my.cnf.d/mariadb-server.cnf
-COPY srcs/wordpress.sql /root/wordpress.sql
 WORKDIR /root/
 RUN mkdir -p /run/mysqld
 RUN chown -R mysql:mysql /run/mysqld /var/lib/mysql