YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename nginx and ssh compatibility setting for consistency

Browse source
This commit is contained in:
Alexandre Aubin 2019-03-22 16:15:11 +01:00
parent e7d322b68c
commit fee79820e0
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/hooks/conf_regen/03-ssh
View file

@ -24,8 +24,8 @@ do_pre_regen() {
fi
# Support different strategy for security configurations
if [[ -n "$(yunohost settings get 'service.ssh.ciphers.compatibility')" ]]; then
ssh_ciphers_compatibility="$(yunohost settings get 'service.ssh.ciphers.compatibility')"
if [[ -n "$(yunohost settings get 'service.ssh.compatibility')" ]]; then
ssh_ciphers_compatibility="$(yunohost settings get 'service.ssh.compatibility')"
fi
export ssh_keys

4
data/hooks/conf_regen/15-nginx
View file

@ -37,8 +37,8 @@ do_pre_regen() {
domain_list=$(sudo yunohost domain list --output-as plain --quiet)
# Support different strategy for security configurations
if [[ -n "$(yunohost settings get 'security.ciphers.compatibility')" ]]; then
security_ciphers_compatibility="$(yunohost settings get 'security.ciphers.compatibility')"
if [[ -n "$(yunohost settings get 'security.nginx.compatibility')" ]]; then
security_ciphers_compatibility="$(yunohost settings get 'security.nginx.compatibility')"
fi
export security_ciphers_compatibility

8
src/yunohost/settings.py
View file

@ -40,9 +40,9 @@ DEFAULTS = OrderedDict([
("security.password.admin.strength", {"type": "int", "default": 1}),
("security.password.user.strength", {"type": "int", "default": 1}),
("service.ssh.allow_deprecated_dsa_hostkey", {"type": "bool", "default": False}),
("service.ssh.ciphers.compatibility", {"type": "enum", "default": "modern",
("security.ssh.compatibility", {"type": "enum", "default": "modern",
"choices": ["intermediate", "modern"]}),
("security.ciphers.compatibility", {"type": "enum", "default": "intermediate",
("security.nginx.compatibility", {"type": "enum", "default": "intermediate",
"choices": ["intermediate", "modern"]}),
])
@ -283,12 +283,12 @@ def trigger_post_change_hook(setting_name, old_value, new_value):
#
# ===========================================
@post_change_hook("security.ciphers.compatibility")
@post_change_hook("security.nginx.compatibility")
def reconfigure_nginx(setting_name, old_value, new_value):
if old_value != new_value:
service_regen_conf(names=['nginx'])
@post_change_hook("service.ssh.ciphers.compatibility")
@post_change_hook("security.ssh.compatibility")
def reconfigure_ssh(setting_name, old_value, new_value):
if old_value != new_value:
service_regen_conf(names=['ssh'])