use gitlab docker registry

This commit is contained in:
Sebastian Hugentobler 2017-09-06 10:46:01 +02:00
parent bdf253be3d
commit c2aad1da9e
6 changed files with 51 additions and 31 deletions

View file

@ -1,3 +1,3 @@
[template]
src = "proftpd.conf.tmpl"
dest = "/usr/local/etc/proftpd.conf"
dest = "/etc/proftpd/proftpd.conf"

View file

@ -5,10 +5,10 @@ Port 22
UseIPv6 off
Umask 006 007
MaxInstances 30
User proftp
Group proftp
DefaultRoot /var/lib/proftp/data
DefaultChdir /var/lib/proftp/data
User proftpd
Group proftpd
DefaultRoot /var/lib/ftp/data
DefaultChdir /var/lib/ftp/data
AllowOverwrite on
RequireValidShell off
@ -19,8 +19,8 @@ RequireValidShell off
<IfModule mod_sftp.c>
SFTPEngine on
SFTPAuthMethods password
SFTPDHParamFile /var/lib/proftp/keys/dhparams.pem
SFTPHostKey /var/lib/proftp/keys/ssh_rsa_key
SFTPDHParamFile /etc/proftpd/keys/dhparams.pem
SFTPHostKey /etc/proftpd/keys/ssh_rsa_key
</IfModule>
<IfModule mod_ldap.c>
@ -39,6 +39,6 @@ RequireValidShell off
LDAPForceDefaultUID on
LDAPForceDefaultGID on
LDAPGenerateHomedir on
LDAPGenerateHomedirPrefix /var/lib/proftp/data
LDAPGenerateHomedirPrefix /var/lib/ftp/data
LDAPForceGeneratedHomedir on
</IfModule>

View file

@ -1,5 +1,5 @@
#!/usr/bin/with-contenv sh
if [ ! -f /var/lib/proftp/keys/dhparams.pem ]; then
openssl dhparam -outform PEM -5 nbits >> /var/lib/proftp/keys/dhparams.pem
if [ ! -f /etc/proftpd/keys/dhparams.pem ]; then
openssl dhparam -outform PEM -5 nbits >> /etc/proftpd/keys/dhparams.pem
fi

View file

@ -1,5 +1,5 @@
#!/usr/bin/with-contenv sh
if [ ! -f /var/lib/proftp/keys/ssh_rsa_key ]; then
ssh-keygen -b 2048 -t rsa -f /var/lib/proftp/keys/ssh_rsa_key -q -N ""
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