From 9b3543c764261fbcc6553481ff236695d564e1cb Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Mon, 28 Apr 2014 22:50:45 -0500 Subject: [PATCH] Allow services to be both internal and external again. Reverting part of 887518ce on Sunil's advice: An assumption made for the sake of simple API is that all externally available services are also available internally. They are not mutually exclusive. Your change will enable a service only if it is not externally available. For example, HTTPS is externally available. It will no longer be made internally available. Which is not right. We should either revert this line or introduce a way to mark all the services as internal as well and write code handle that properly. --- modules/installed/system/firewall.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/installed/system/firewall.py b/modules/installed/system/firewall.py index b82bdd06f..069dfb658 100644 --- a/modules/installed/system/firewall.py +++ b/modules/installed/system/firewall.py @@ -171,8 +171,7 @@ a service is automatically disabled in the firewall.

''' service = service_module.SERVICES[service_id] for port in service.ports: if enabled: - if (not service.is_external and - port not in internal_enabled_services): + if port not in internal_enabled_services: self.add_service(port, zone='internal') if (service.is_external and