nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-02-04 08:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

firewall: Don't infer firewall service name

Browse Source 
Now that all firewall ports are explicitly specified for all services,
it is safer to remove automatic infering of firewall service name from
systemd service name.  This Closes: #468 where firewall status is
being shown for 'software upgrades'.
This commit is contained in:
Sunil Mohan Adapa 2016-06-03 18:06:42 +05:30 committed by James Valleroy
parent f245e7e763
commit 4c30d5e8a5
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plinth/service.py
View File

@ -37,18 +37,17 @@ class Service(object):
for operation.
- service_id: unique service name. If possible this should be the name of
the service on operating system level (as in /etc/init.d/).
the service's systemd unit file (without the extension).
- name: service name as to be displayed in the GUI
- is_enabled (optional): Boolean, or a Function returning Boolean
- enable (optional): Function
- disable (optional): Function
- is_running (optional): Boolean, or a Function returning Boolean
- is_enabled (optional): Boolean or a method returning Boolean
- enable (optional): method
- disable (optional): method
- is_running (optional): Boolean or a method returning Boolean
"""
def __init__(self, service_id, name, ports=None, is_external=False,
is_enabled=None, enable=None, disable=None, is_running=None):
if ports is None:
ports = [service_id]
ports = []
if is_enabled is None:
is_enabled = self._default_is_enabled
@ -123,4 +122,4 @@ def init():
is_external=True, is_enabled=True)
Service('plinth', format_lazy(_('{box_name} Web Interface (Plinth)'),
box_name=_(cfg.box_name)),
ports=['https'], is_external=True, is_enabled=True)
ports=['https'], is_external=True, is_enabled=True)