better support for customization
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Paolo Asperti 2020-08-12 16:07:38 +02:00
parent 750799ccdc
commit 9b26bdf411
Signed by: paspo
GPG Key ID: 06D46905D19D5182
3 changed files with 10 additions and 3 deletions

View File

@ -3,7 +3,7 @@ FROM alpine:edge
RUN \ RUN \
echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \ echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
apk -U add proftpd proftpd-mod_tls proftpd-utils openssl perl && \ apk -U add proftpd proftpd-mod_tls proftpd-utils openssl perl && \
mkdir -p /var/run/proftpd mkdir -p /var/run/proftpd /etc/proftpd/custom.conf.d/
COPY custom.conf /etc/proftpd/conf.d/custom.conf COPY custom.conf /etc/proftpd/conf.d/custom.conf
COPY run.sh /run.sh COPY run.sh /run.sh

View File

@ -48,9 +48,9 @@ services:
- "50000-50500:50000-50500" - "50000-50500:50000-50500"
volumes: volumes:
- "/srv/ftps/auth:/auth" - "/srv/ftps/auth:/auth"
- "/srv/fpts/extra.conf:/etc/proftpd/conf.d/extra.conf:ro" - "/srv/ftps/conf:/etc/proftpd/custom.conf.d:ro"
- "/srv/ftps/data:/home" - "/srv/ftps/data:/home"
- "/etc/letsencrypt:/certs" - "/etc/letsencrypt:/certs:ro"
environment: environment:
- MASQUERADE=ftp.mydomain.com - MASQUERADE=ftp.mydomain.com
- TLS_CERT=/certs/live/ftp.mydomain.com/cert.pem - TLS_CERT=/certs/live/ftp.mydomain.com/cert.pem

View File

@ -23,3 +23,10 @@ MaxClientsPerHost 5
TLSOptions NoSessionReuseRequired AllowClientRenegotiations TLSOptions NoSessionReuseRequired AllowClientRenegotiations
TLSRequired on TLSRequired on
</IfModule> </IfModule>
<IfModule mod_delay.c>
DelayOnEvent FailedLogin 5s
DelayTable /run/proftpd/proftpd.delay
</IfModule>
Include /etc/proftpd/custom.conf.d/