Skip to content

Commit

Permalink
v4.2.19 (#144)
Browse files Browse the repository at this point in the history
Minor updates
* Using latest base image
* Fixing debug logging
  • Loading branch information
bfren authored Nov 20, 2024
1 parent 53ccd4f commit b5d667c
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
files/
ssl/
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.13
FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.14

LABEL org.opencontainers.image.source="https://github.com/bfren/docker-ftps"

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.18
4.2.19
14 changes: 11 additions & 3 deletions overlay/etc/bf/templates/vsftpd.conf.esh
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,11 @@ isolate_network=NO
#
# If enabled, then any log output which would have gone to /var/log/vsftpd.log
# goes to the system log instead. Logging is done under the FTPD facility.
syslog_enable=YES
vsftpd_log_file=<% bf-env FTPS_VSFTPD_LOG_FILE %>
#
# When enabled, all FTP requests and responses are logged, providing the
# option xferlog_std_format is not enabled. Useful for debugging.
log_ftp_protocol=YES
<% else -%>
#
# The target log file can be vsftpd_log_file or xferlog_file.
# This depends on setting xferlog_std_format parameter
Expand All @@ -190,5 +189,14 @@ xferlog_file=<% bf-env FTPS_VSFTPD_LOG_FILE %>
#
# Switches between logging into vsftpd_log_file and xferlog_file files.
# NO writes to vsftpd_log_file, YES to xferlog_file
xferlog_std_format=YES
xferlog_std_format=NO
<% else -%>
#
# When enabled, all FTP requests and responses are logged, providing the
# option xferlog_std_format is not enabled. Useful for debugging.
log_ftp_protocol=NO
#
# The target log file can be vsftpd_log_file or xferlog_file.
# This depends on setting xferlog_std_format parameter
xferlog_enable=NO
<% fi %>
Empty file.
Empty file.
8 changes: 8 additions & 0 deletions overlay/etc/s6-overlay/s6-rc.d/vsftpd-log/finish
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/nu

use bf
use bf-s6
bf env load -x vsftpd-log

# Show helpful log message
def main [...args] { bf-s6 svc finish }
8 changes: 8 additions & 0 deletions overlay/etc/s6-overlay/s6-rc.d/vsftpd-log/run
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/nu

use bf
use bf-s6
bf env load -x vsftpd-log

# Forward vsftpd log to Docker
def main [...args] { bf-s6 log forward vsftpd-log (bf env FTPS_VSFTPD_LOG_FILE) }
1 change: 1 addition & 0 deletions overlay/etc/s6-overlay/s6-rc.d/vsftpd-log/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
longrun
7 changes: 6 additions & 1 deletion run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ docker buildx build \
-e BF_FTPS_EXTERNAL_IP=127.0.0.1 \
-e BF_FTPS_VSFTPD_USER=foo \
-e BF_FTPS_VSFTPD_PASS=bar \
-p "127.0.0.1:5353:53/udp" \
-e BF_FTPS_VSFTPD_ENABLE_DEBUG_LOG=1 \
-p "127.0.0.1:21:21" \
-p "127.0.0.1:990:990" \
-p "127.0.0.1:18700-18710:18700-18710" \
-v "$(pwd)/files:/files" \
-v "$(pwd)/ssl:/ssl" \
ftps-dev \
sh

0 comments on commit b5d667c

Please sign in to comment.