smeserver/smeserver-proftpd
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Tue Mar 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme

Browse Source 
- handle dhparams [SME: 12963]
This commit is contained in:
Jean-Philippe Pialasse 2025-03-18 00:39:18 -04:00
parent 7fe3a22ad3
commit a545dc6458
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
createlinks
View File

@ -80,4 +80,12 @@ templates2events("/etc/systemd/system-preset/49-koozali.preset", $event);
event_link("systemd-reload", $event, "89"); event_link("systemd-reload", $event, "89");
templates2events("/etc/rsyslog.conf", $event); templates2events("/etc/rsyslog.conf", $event);
$event = "dhparam-update";
templates2events("/etc/proftpd.conf", $event);
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/proftpd");
$event = "smeserver-base-update";
templates2events("/etc/proftpd.conf", $event);
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/proftpd");
exit 0; exit 0;

16
root/etc/e-smith/templates/etc/proftpd.conf/06ModTLS
View File

@ -18,29 +18,35 @@
my $chain_file = $modSSL{CertificateChainFile} || my $chain_file = $modSSL{CertificateChainFile} ||
"# no chain cert"; "# no chain cert";
$chain_file = "# no chain cert" unless -e $chain_file; $chain_file = "# no chain cert" unless -e $chain_file;
$chain_file = ( $chain_file eq "# no chain cert" )? $chain_file : "TLSCertificateChainFile $chain_file"; $chain_file = ( $chain_file eq "# no chain cert" )? $chain_file : "TLSCertificateChainFile $chain_file";
#/home/e-smith/dh.pem/4096.pem
my $ftpdhparam = "#no dh param";
$ftpdhparam = "SFTPDHParamFile /home/e-smith/dh.pem/2048.pem" if (dh_exists_good_size("2048","/home/e-smith/dh.pem/2048.pem"));
$ftpdhparam = "SFTPDHParamFile /home/e-smith/dh.pem/4096.pem" if (dh_exists_good_size("4096","/home/e-smith/dh.pem/4096.pem"));
my $ciphers = $ftp{CipherSuite} || $modSSL{CipherSuite} || $smeCiphers; my $ciphers = $ftp{CipherSuite} || $modSSL{CipherSuite} || $smeCiphers;
#SME11 proftpd 1.3.6 branch does not support TLS v1.3 #SME11 proftpd 1.3.6 branch does not support TLS v1.3
$smeSSLprotocol =~ s/TLSv1.3//; $smeSSLprotocol =~ s/TLSv1.3//;
# NoSessionReuseRequired is required with newer clients and TLS to be bale to list folder # NoSessionReuseRequired is required with newer clients and TLS to be bale to list folder
$OUT .= <<SSL_END; $OUT .= <<SSL_END;
<IfModule mod_tls.c> <IfModule mod_tls.c>
TLSEngine on TLSEngine on
TLSLog /var/log/proftpd/tls.log TLSLog /var/log/proftpd/tls.log
TLSProtocol $smeSSLprotocol TLSProtocol $smeSSLprotocol
TLSCipherSuite $ciphers TLSCipherSuite $ciphers
TLSOptions NoCertRequest AllowClientRenegotiations NoSessionReuseRequired TLSOptions NoCertRequest AllowClientRenegotiations NoSessionReuseRequired
TLSRSACertificateFile $crt TLSRSACertificateFile $crt
TLSRSACertificateKeyFile $key TLSRSACertificateKeyFile $key
$chain_file $chain_file
$ftpdhparam
TLSVerifyClient $tlsclient TLSVerifyClient $tlsclient
TLSRequired $tlsrequired TLSRequired $tlsrequired
</IfModule> </IfModule>
SSL_END SSL_END
} }
} }

2
root/usr/lib/systemd/system/dhparam-generator.service.d/52proftpd.conf Normal file
View File

@ -0,0 +1,2 @@
[Service]
ExecStartPost=-/sbin/e-smith/expand-template /etc/proftpd.conf

5
smeserver-proftpd.spec
View File

@ -4,7 +4,7 @@ Summary: smeserver specific proftpd configuration files and templates
%define name smeserver-proftpd %define name smeserver-proftpd
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 8 %define release 9
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -26,6 +26,9 @@ Provides: e-smith-proftpd
AutoReqProv: no AutoReqProv: no
%changelog %changelog
* Tue Mar 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme
- handle dhparams [SME: 12963]
* Mon Feb 24 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme * Mon Feb 24 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
- move peer template from /var/service/ftp to proftpd [SME: 12942] - move peer template from /var/service/ftp to proftpd [SME: 12942]