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

We can't have include blocks in sshd_config :|

Browse source
This commit is contained in:
Alexandre Aubin 2018-11-28 19:45:19 +00:00
parent f295c83fd3
commit 25efab7f2a
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/yunohost/data_migrations/0007_ssh_conf_managed_by_yunohost_step1.py
View file

@ -64,24 +64,6 @@ class MyMigration(Migration):
service_regen_conf(names=['ssh'], force=True) service_regen_conf(names=['ssh'], force=True)
copyfile('/etc/ssh/sshd_config.bkp', SSHD_CONF) copyfile('/etc/ssh/sshd_config.bkp', SSHD_CONF)
# If we detect the conf as manually modified
ynh_hash = _get_conf_hashes('ssh').get(SSHD_CONF, None)
current_hash = _calculate_hash(SSHD_CONF)
if ynh_hash != current_hash:
# And if there's not already an "Include ssh_config.d/*" directive
include_rgx = r'^[ \t]*Include[ \t]+sshd_config\.d/\*[ \t]*(?:#.*)?$'
add_include = False
for line in open(SSHD_CONF):
if re.match(include_rgx, line) is not None:
add_include = True
break
# We add an "Include sshd_config.d/*" directive
if add_include:
with open(SSHD_CONF, "a") as conf:
conf.write('Include sshd_config.d/*')
# Restart ssh and backward if it fail # Restart ssh and backward if it fail
if not _run_service_command('restart', 'ssh'): if not _run_service_command('restart', 'ssh'):
self.backward() self.backward()