From 474f70e1649aaee3d0b90fcc16fde131506dc12a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Wed, 20 Jun 2018 19:23:33 +0200
Subject: [PATCH] Don't open the port range in scripts

---
 scripts/install | 8 +-------
 scripts/remove  | 1 -
 scripts/restore | 8 +-------
 scripts/upgrade | 9 ---------
 4 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/scripts/install b/scripts/install
index 327f818..0923728 100644
--- a/scripts/install
+++ b/scripts/install
@@ -77,12 +77,6 @@ yunohost firewall allow TCP $synapse_tls_port > /dev/null 2>&1
 yunohost firewall allow Both $turnserver_tls_port > /dev/null 2>&1
 yunohost firewall allow Both $turnserver_alt_tls_port > /dev/null 2>&1
 
-# Open the range 49152-49192 only if it as not been open by an other instance
-if ! yunohost firewall list | grep -q "\- 49152:49192$"
-then
-    yunohost firewall allow Both 49152:49192 > /dev/null 2>&1
-fi
-
 # Store opened ports
 ynh_app_setting_set $app synapse_port $port
 ynh_app_setting_set $app synapse_tls_port $synapse_tls_port
@@ -334,7 +328,7 @@ _matrix._tcp.$domain. 3600    IN      SRV     10 0 $synapse_tls_port $domain.
 
 You also need to open the TCP port $synapse_tls_port on your ISP box if it's not automatically done.
 
-Your synapse server also implements a turnserver (for VoIP), to have this fully functional open the TCP and UDP port $turnserver_tls_port, $turnserver_alt_tls_port and the range 49152 - 49192 (if it's not automatically done).
+Your synapse server also implements a turnserver (for VoIP), to have this fully functional open the TCP and UDP port $turnserver_tls_port, $turnserver_alt_tls_port and the range 49153 - 49193.
 
 If you're facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/synapse_ynh"
 
diff --git a/scripts/remove b/scripts/remove
index 91a68c6..e3cbf9a 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -58,7 +58,6 @@ closeport() {
 closeport $synapse_tls_port
 closeport $turnserver_tls_port
 closeport $turnserver_alt_tls_port
-closeport '49152:49192'
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/restore b/scripts/restore
index b232369..84d818f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -128,12 +128,6 @@ yunohost firewall allow TCP $synapse_tls_port > /dev/null 2>&1
 yunohost firewall allow Both $turnserver_tls_port > /dev/null 2>&1
 yunohost firewall allow Both $turnserver_alt_tls_port > /dev/null 2>&1
 
-# Open the range 49152-49192 only if it as not been open by an other instance
-if ! yunohost firewall list | grep -q "\- 49152:49192$"
-then
-    yunohost firewall allow Both 49152:49192 > /dev/null 2>&1
-fi
-
 #=================================================
 # SETUP SSOWAT
 #=================================================
@@ -212,7 +206,7 @@ _matrix._tcp.$domain. 3600    IN      SRV     10 0 $synapse_tls_port $domain.
 
 You also need to open the TCP port $synapse_tls_port on your ISP box if it's not automatically done.
 
-Your synapse server also implements a turnserver (for VoIP), to have this fully functional open the TCP and UDP port $turnserver_tls_port, $turnserver_alt_tls_port and the range 49152 - 49192 (if it's not automatically done).
+Your synapse server also implements a turnserver (for VoIP), to have this fully functional open the TCP and UDP port $turnserver_tls_port, $turnserver_alt_tls_port and the range 49153 - 49193 (if it's not automatically done).
 
 If you're facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/synapse_ynh"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index fe8c071..2366dfb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -204,15 +204,6 @@ test -e /etc/matrix-$app/dh.pem || \
     cp /etc/yunohost/certs/$domain/dh.pem /etc/matrix-$app/dh.pem || \
         openssl dhparam -out /etc/matrix-$app/dh.pem 2048 > /dev/null
 
-#=================================================
-# MIGRATION 4 : FIX TURNSERVER CONFIG
-#=================================================
-
-if ! yunohost firewall list | grep -q "\- 49152:49192$"
-then
-    yunohost firewall allow Both 49152:49192 > /dev/null 2>&1
-fi
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================