Fix handling of ssh_password_authentication

The current template use if/else/endif which introduce
spurious empty lines. As the setting value is "yes" or "no", as expected
by the configuration file, the value is directly use.

All uses of passwordauthentication are addressed. This adds the one
used for the sftp group.

Finally, the global configuration sets the yes and no values
to "yes" and "no" respectively.
This commit is contained in:
Nicolas Palix 2022-12-19 18:38:08 +01:00
parent 19eb48b6e7
commit 839672d28f
2 changed files with 4 additions and 6 deletions

View file

@ -57,11 +57,7 @@ UsePAM yes
# PLEASE: if you wish to force everybody to authenticate using ssh keys, run this command:
# yunohost settings set security.ssh.ssh_password_authentication -v no
{% if password_authentication == "False" %}
PasswordAuthentication no
{% else %}
#PasswordAuthentication yes
{% endif %}
PasswordAuthentication {{ password_authentication }}
# Post-login stuff
Banner /etc/issue.net
@ -103,7 +99,7 @@ Match Group sftp.app,!ssh.app
AllowStreamLocalForwarding no
PermitTunnel no
PermitUserRC no
PasswordAuthentication yes
PasswordAuthentication {{ password_authentication }}
# root login is allowed on local networks
# It's meant to be a backup solution in case LDAP is down and

View file

@ -42,6 +42,8 @@ name = "Security"
[security.ssh.ssh_password_authentication]
type = "boolean"
default = true
yes = "yes"
no = "no"
[security.nginx]
name = "NGINX (web server)"