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

Minor global variable naming fix

Browse Source 
- For Python coding standards compliance
This commit is contained in:
Sunil Mohan Adapa 2015-09-27 22:50:17 +05:30
parent d0bc2be3a3
commit 0e111d833c
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plinth/modules/firewall/firewall.py
View File

@ -55,7 +55,7 @@ def index(request):
return TemplateResponse( return TemplateResponse(
request, 'firewall.html', request, 'firewall.html',
{'title': _('Firewall'), {'title': _('Firewall'),
'services': list(service_module.SERVICES.values()), 'services': list(service_module.services.values()),
'internal_enabled_services': internal_enabled_services, 'internal_enabled_services': internal_enabled_services,
'external_enabled_services': external_enabled_services}) 'external_enabled_services': external_enabled_services})
@ -94,7 +94,7 @@ def on_service_enabled(sender, service_id, enabled, **kwargs):
external_enabled_services = get_enabled_services(zone='external') external_enabled_services = get_enabled_services(zone='external')
LOGGER.info('Service enabled - %s, %s', service_id, enabled) LOGGER.info('Service enabled - %s, %s', service_id, enabled)
service = service_module.SERVICES[service_id] service = service_module.services[service_id]
for port in service.ports: for port in service.ports:
if enabled: if enabled:
if port not in internal_enabled_services: if port not in internal_enabled_services:
@ -110,7 +110,7 @@ def on_service_enabled(sender, service_id, enabled, **kwargs):
if port in internal_enabled_services: if port in internal_enabled_services:
enabled_services_on_port = [ enabled_services_on_port = [
service_.is_enabled() service_.is_enabled()
for service_ in service_module.SERVICES.values() for service_ in service_module.services.values()
if port in service_.ports and if port in service_.ports and
service_id != service_.service_id] service_id != service_.service_id]
if not any(enabled_services_on_port): if not any(enabled_services_on_port):
@ -119,7 +119,7 @@ def on_service_enabled(sender, service_id, enabled, **kwargs):
if port in external_enabled_services: if port in external_enabled_services:
enabled_services_on_port = [ enabled_services_on_port = [
service_.is_enabled() service_.is_enabled()
for service_ in service_module.SERVICES.values() for service_ in service_module.services.values()
if port in service_.ports and if port in service_.ports and
service_id != service_.service_id and service_id != service_.service_id and
service_.is_external] service_.is_external]

15
plinth/modules/owncloud/owncloud.py
View File

@ -27,10 +27,10 @@ from gettext import gettext as _
from plinth import actions from plinth import actions
from plinth import cfg from plinth import cfg
from plinth import package from plinth import package
from plinth import service from plinth import service as service_module
SERVICE = None service = None
class OwnCloudForm(forms.Form): # pylint: disable-msg=W0232 class OwnCloudForm(forms.Form): # pylint: disable-msg=W0232
@ -46,15 +46,16 @@ def init():
status = get_status() status = get_status()
global SERVICE # pylint: disable-msg=W0603 global service # pylint: disable-msg=W0603
SERVICE = service.Service('owncloud', _('ownCloud'), ['http', 'https'], service = service_module.Service(
is_external=True, enabled=status['enabled']) 'owncloud', _('ownCloud'), ['http', 'https'], is_external=True,
enabled=status['enabled'])
def on_install(): def on_install():
"""Tasks to run after package install.""" """Tasks to run after package install."""
actions.superuser_run('owncloud-setup', ['enable'], async=True) actions.superuser_run('owncloud-setup', ['enable'], async=True)
SERVICE.notify_enabled(None, True) service.notify_enabled(None, True)
@package.required(['postgresql', 'php5-pgsql', 'owncloud'], @package.required(['postgresql', 'php5-pgsql', 'owncloud'],
@ -103,4 +104,4 @@ def _apply_changes(request, old_status, new_status):
# Send a signal to other modules that the service is # Send a signal to other modules that the service is
# enabled/disabled # enabled/disabled
SERVICE.notify_enabled(None, new_status['enabled']) service.notify_enabled(None, new_status['enabled'])

4
plinth/service.py
View File

@ -26,7 +26,7 @@ import collections
from plinth.signals import service_enabled from plinth.signals import service_enabled
SERVICES = {} services = {}
class Service(object): class Service(object):
@ -48,7 +48,7 @@ class Service(object):
self._enabled = enabled self._enabled = enabled
# Maintain a complete list of services # Maintain a complete list of services
SERVICES[service_id] = self services[service_id] = self
def is_enabled(self): def is_enabled(self):
"""Return whether the service is enabled.""" """Return whether the service is enabled."""