adding sql migration support

.env.tpl

@@ -2,6 +2,9 @@ FTP_DB_HOST=    # db hostname or ip address, required
 FTP_DB_NAME=    # db name, required
 FTP_DB_USER=    # db user, required
 FTP_DB_PASS=    # db password, required
+FTP_DB_ADMIN=         # db user, required
+FTP_DB_ADMIN_PASS=    # db password, required
+FTP_PG_MIGRATE=       # ON/OFF, activate/deactivate
 
 FTP_ROOT=       # /path/to/ftp/root, optional, defaults to /data/ftp_root
 LOGS=           # /path/to/log/dir, optional, defaults to /var/log/proftpd

Dockerfile

@@ -36,6 +36,9 @@ COPY vroot.conf /etc/proftpd/vroot.conf
 COPY ./certs /etc/proftpd/certs
 COPY ./exec /etc/proftpd/exec
 
+# SQL MIGRATION TEMPLATE
+COPY sql/proftp_tables.sql.tpl /etc/proftpd/proftp_tables.sql.tpl
+
 COPY entrypoint.sh ./entrypoint.sh
 RUN chmod a+x ./entrypoint.sh
 

Dockerfile-alpine

@@ -6,7 +6,8 @@ RUN set -x && \
   apk add --no-cache --virtual .persistent-deps \
     ca-certificates \
     curl \
-    postgresql-client && \
+    postgresql-client \
+    gettext && \
   apk add --no-cache --virtual .build-deps \
     git \
     build-base \
@@ -44,6 +45,9 @@ COPY vroot.conf /etc/proftpd/vroot.conf
 COPY ./certs /etc/proftpd/certs
 COPY ./exec /etc/proftpd/exec
 
+# SQL MIGRATION TEMPLATE
+COPY sql/proftp_tables.sql.tpl /etc/proftpd/proftp_tables.sql.tpl
+
 COPY entrypoint.sh ./entrypoint.sh
 RUN chmod a+x ./entrypoint.sh
 

docker-compose-alpine.yml

@@ -23,9 +23,6 @@ services:
       - type: bind
         source: "${MOD_EXEC_DIR:-./exec}"
         target: "/etc/proftpd/exec"
-      - type: bind
-        source: "${SALT:-./.salt}"
-        target: "/etc/proftpd/.salt"
       - type: bind
         source: "${MOD_VROOT_CONF:-./vroot.conf}"
         target: "/etc/proftpd/vroot.conf"

entrypoint.sh

@@ -10,6 +10,24 @@ if [ ! -z "$MASQ_ADDR" ]; then
 	PROFTPD_ARGS="$PROFTPD_ARGS -DUSE_MASQ_ADDR"
 fi
 
+if [ "$FTP_PG_MIGRATE" = "ON" ]; then
+	## Create sql migration file from proftp_tables.sql.tpl template
+	envsubst < /etc/proftpd/proftp_tables.sql.tpl > /etc/proftpd/proftp_tables.sql
+	rm /etc/proftpd/proftp_tables.sql.tpl
+
+	## Init the PGPASSWORD env var so psql does not prompt it
+	export PGPASSWORD=$FTP_DB_ADMIN_PASS
+
+	## Wait for it : Postgres db is ready
+	until psql -h $FTP_DB_HOST -d $FTP_DB_NAME -U $FTP_DB_ADMIN -p 5432 -c '\l'; do
+	  echo "Postgres is unavailable - sleeping"
+	  sleep 1
+	done
+
+	echo "Postgres is up - executing command"
+	psql -h $FTP_DB_HOST -d $FTP_DB_NAME -U $FTP_DB_ADMIN -p 5432 < /etc/proftpd/proftp_tables.sql -w
+fi
+
 echo $PWD_SALT > /etc/proftpd/.salt
 
 # allow proftpd writing custom logs

sql/proftp_tables.sql.tpl

@@ -0,0 +1,29 @@
+CREATE SCHEMA ftp;
+GRANT USAGE ON SCHEMA ftp TO $FTP_DB_USER;
+
+CREATE TABLE ftp.users (
+  userid    VARCHAR(30) NOT NULL UNIQUE,
+  passwd    VARCHAR(80) NOT NULL,
+  uid       INTEGER UNIQUE,
+  gid       INTEGER,
+  homedir   VARCHAR(255),
+  shell     VARCHAR(255),
+  last_accessed TIMESTAMP WITH TIME ZONE
+);
+GRANT SELECT, UPDATE ON ftp.users TO $FTP_DB_USER;
+
+CREATE TABLE ftp.groups (
+  groupname VARCHAR(30) NOT NULL,
+  gid INTEGER NOT NULL,
+  members VARCHAR(255)
+);
+GRANT SELECT ON ftp.groups TO $FTP_DB_USER;
+
+CREATE TABLE ftp.login_history (
+  userid VARCHAR NOT NULL,
+  client_ip VARCHAR NOT NULL,
+  server_ip VARCHAR NOT NULL,
+  protocol VARCHAR NOT NULL,
+  login_date TIMESTAMP WITH TIME ZONE
+);
+GRANT INSERT ON ftp.login_history TO $FTP_DB_USER;