prepare for k3s

2021-09-28 15:55:15 +02:00 · 2021-09-28 15:55:15 +02:00 · 98dc1fb1a5
commit 98dc1fb1a5
parent 970da1228c
6 changed files with 19 additions and 16 deletions
--- a/rootfs/etc/confd/templates/proftpd.conf.tmpl
+++ b/rootfs/etc/confd/templates/proftpd.conf.tmpl
@ -3,7 +3,7 @@ Include /etc/proftpd/modules.d/*.conf
 ServerName "{{getenv "SERVER_NAME"}}"
 ServerType standalone
 DefaultServer on
-Port 22
+Port 2222
 UseIPv6 off
 Umask {{ getenv "UMASK" "006 007" }}
 MaxInstances 30
@ -27,6 +27,6 @@ AuthUserFile /etc/proftpd/passwd
    SFTPEngine on
    SFTPAuthMethods password
    SFTPDHParamFile /etc/proftpd/keys/dhparams.pem
-    SFTPHostKey /etc/proftpd/keys/ssh_rsa_key
+    SFTPHostKey /etc/proftpd/keys/ssh_key
    SFTPOptions IgnoreSCPUploadPerms IgnoreSFTPUploadPerms
 </IfModule>
--- a/rootfs/etc/cont-init.d/02-dhparam
+++ b/rootfs/etc/cont-init.d/02-dhparam
@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-if [ ! -f /etc/proftpd/keys/dhparams.pem ]; then
-    openssl dhparam -outform PEM -5 nbits >> /etc/proftpd/keys/dhparams.pem
-fi
--- a/rootfs/etc/cont-init.d/02-static-user
+++ b/rootfs/etc/cont-init.d/02-static-user
--- a/rootfs/etc/cont-init.d/03-ssh-keys
+++ b/rootfs/etc/cont-init.d/03-ssh-keys
@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-if [ ! -f /etc/proftpd/keys/ssh_rsa_key ]; then
-    ssh-keygen -b 2048 -t rsa -f /etc/proftpd/keys/ssh_rsa_key -q -N ""
-fi