From 7a80e04dddfffedda559daf336a817c3452a2915 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Tue, 20 Sep 2016 19:39:17 +0530
Subject: [PATCH] repro: Use firewalld provided SIP services

Now that firewalld has service definitions for SIP and SIP over
TLS/DTLS use them instead of custom service definitions.
---
 data/usr/lib/firewalld/services/sip-plinth.xml     | 7 -------
 data/usr/lib/firewalld/services/sip-tls-plinth.xml | 7 -------
 plinth/modules/repro/__init__.py                   | 2 +-
 3 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 data/usr/lib/firewalld/services/sip-plinth.xml
 delete mode 100644 data/usr/lib/firewalld/services/sip-tls-plinth.xml

diff --git a/data/usr/lib/firewalld/services/sip-plinth.xml b/data/usr/lib/firewalld/services/sip-plinth.xml
deleted file mode 100644
index 47d6c12db..000000000
--- a/data/usr/lib/firewalld/services/sip-plinth.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <short>SIP</short>
-  <description>The Session Initiaion Protocol (SIP) is commonly used in Internet telephony for audio/video calls and instant messaging.  Enable this if you are running a SIP proxy, registrar, redirector or gateway server over an unencrypted channel.</description>
-  <port protocol="udp" port="5060"/>
-  <port protocol="tcp" port="5060"/>
-</service>
diff --git a/data/usr/lib/firewalld/services/sip-tls-plinth.xml b/data/usr/lib/firewalld/services/sip-tls-plinth.xml
deleted file mode 100644
index 50b97a100..000000000
--- a/data/usr/lib/firewalld/services/sip-tls-plinth.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <short>SIP over TLS/DTLS</short>
-  <description>The Session Initiaion Protocol (SIP) is commonly used in Internet telephony for audio/video calls and instant messaging.  Enable this if you are running a SIP proxy, registrar, redirector or gateway server over a channel encrypted using TLS or DTLS.</description>
-  <port protocol="udp" port="5061"/>
-  <port protocol="tcp" port="5061"/>
-</service>
diff --git a/plinth/modules/repro/__init__.py b/plinth/modules/repro/__init__.py
index d9900bcf9..b5a6c26b7 100644
--- a/plinth/modules/repro/__init__.py
+++ b/plinth/modules/repro/__init__.py
@@ -69,7 +69,7 @@ def init():
 
     global service
     service = service_module.Service(
-        managed_services[0], title, ports=['sip-plinth', 'sip-tls-plinth'],
+        managed_services[0], title, ports=['sip', 'sips'],
         is_external=True, enable=enable, disable=disable)
 
     if service.is_enabled():