From 1d4dd6ac681d38818f71dd2aecda0562a32dfca2 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 31 Mar 2017 18:33:45 +0200 Subject: [PATCH] Use vsftpd via systemd on ftp We also only need a list of bind addresses, so merge them. --- modules/roles/manifests/ftp.pp | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp index 5823032cc..712a597d9 100644 --- a/modules/roles/manifests/ftp.pp +++ b/modules/roles/manifests/ftp.pp @@ -3,31 +3,16 @@ class roles::ftp { include ferm::ftp_conntrack - $bind = $::hostname ? { - klecker => '::ffff:130.89.148.12', - default => '', + $binds = $::hostname ? { + klecker => [ '130.89.148.12', '[2001:610:1908:b000::148:12]' ], + default => [ '[::]' ], } - $bind6 = $::hostname ? { - klecker => '2001:610:1908:b000::148:12', - default => '', - } - - vsftpd::site { 'ftp': + vsftpd::site_systemd { 'ftp': banner => 'ftp.debian.org FTP server', logfile => '/var/log/ftp/vsftpd-ftp.debian.org.log', - bind => $bind, + binds => $binds, max_clients => 200, root => '/srv/ftp.debian.org/ftp.root', } - - if $bind6 != '' { - vsftpd::site { 'ftp-v6': - banner => 'ftp.debian.org FTP server', - logfile => '/var/log/ftp/vsftpd-ftp.debian.org.log', - bind => $bind6, - max_clients => 200, - root => '/srv/ftp.debian.org/ftp.root', - } - } } -- 2.20.1