From 4db65682eb468edc81ae043f2da03909437f557d Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 28 Nov 2018 20:42:39 +0000
Subject: [PATCH] Fix IPv6 handling in ssh regen conf script

---
 data/hooks/conf_regen/03-ssh   | 5 +++--
 data/templates/ssh/sshd_config | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/hooks/conf_regen/03-ssh b/data/hooks/conf_regen/03-ssh
index dac21b19b..271ad9bb8 100755
--- a/data/hooks/conf_regen/03-ssh
+++ b/data/hooks/conf_regen/03-ssh
@@ -11,9 +11,9 @@ do_pre_regen() {
 
   # Don't overwrite configuration if from_script
   if [[ ! -f /etc/yunohost/from_script ]]; then
+
       # do not listen to IPv6 if unavailable
-      [[ -f /proc/net/if_inet6 ]] \
-        || sed -i "s/ListenAddress ::/#ListenAddress ::/g" sshd_config
+      [[ -f /proc/net/if_inet6 ]] && ipv6_enabled=true || ipv6_enabled=false
 
       ssh_keys=$(ls /etc/ssh/ssh_host_{ed25519,rsa,ecdsa}_key 2>/dev/null)
 
@@ -23,6 +23,7 @@ do_pre_regen() {
       fi
 
       export ssh_keys
+      export ipv6_enabled
       ynh_render_template "sshd_config" "${pending_dir}/etc/ssh/sshd_config"
   fi
 }
diff --git a/data/templates/ssh/sshd_config b/data/templates/ssh/sshd_config
index ed9a3136e..9d6c078b9 100644
--- a/data/templates/ssh/sshd_config
+++ b/data/templates/ssh/sshd_config
@@ -4,7 +4,7 @@
 Protocol 2
 Port 22
 
-ListenAddress ::
+{% if ipv6_enabled == "true" %}ListenAddress ::{% endif %}
 ListenAddress 0.0.0.0
 
 {% for key in ssh_keys.split() %}