Attachment 10299 Details for Bug 44880

[patch] patch

firewall.patch (text/plain), 2.17 KB, created by Christian Castens on 2020-02-26 14:28 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Castens

Created: 2020-02-26 14:28 CET

Size: 2.17 KB

patch

obsolete

>diff --git a/base/univention-config-registry/python/univention/service_info.py b/base/univention-config-registry/python/univention/service_info.py
>index f8abd98e08..ce26d6a23e 100644
>--- a/base/univention-config-registry/python/univention/service_info.py                                                                     
>+++ b/base/univention-config-registry/python/univention/service_info.py
>@@ -49,7 +49,7 @@ class Service(uit.LocalizedDictionary):
>    """   
> 
>    REQUIRED = frozenset(('description', 'programs'))
>-   OPTIONAL = frozenset(('start_type', 'systemd', 'icon', 'name', 'init_script'))
>+   OPTIONAL = frozenset(('start_type', 'systemd', 'icon', 'name', 'init_script', 'use_systemd_status'))
>    KNOWN = REQUIRED | OPTIONAL
> 
>    def __init__(self, *args, **kwargs):
>@@ -69,13 +69,19 @@ class Service(uit.LocalizedDictionary):
>        return incomplete + unknown
> 
>    def _update_status(self):
>-       for prog in self['programs'].split(','):
>-           prog = prog.strip()
>-           if prog and not pidof(prog):
>+       if self.get('use_systemd_status') and self['use_systemd_status'] == 'True':
>+           if self._exec(['systemctl', 'is-active', self['systemd']])[1] == 'active':
>+               self.running = True
>+           else:
>                self.running = False 
>-               break
>        else: 
>-           self.running = True
>+           for prog in self['programs'].split(','):
>+               prog = prog.strip()
>+               if prog and not pidof(prog):
>+                   self.running = False
>+                   break
>+           else:
>+               self.running = True
> 
>    def start(self):
>        """Start the service."""
>diff --git a/base/univention-firewall/debian/univention-firewall.univention-service b/base/univention-firewall/debian/univention-firewall.univention-service
>new file mode 100644
>index 0000000000..346b9c2f31
>--- /dev/null
>+++ b/base/univention-firewall/debian/univention-firewall.univention-service
>@@ -0,0 +1,8 @@
>+[univention-firewall]
>+Description[de]=Univention Firewall
>+Description[en]=Univention Firewall
>+start_type=firewall/autostart
>+systemd=univention-firewall.service
>+icon=service/firewall
>+use_systemd_status=True
>+programs=None
>

Actions: View | Diff

Attachments on bug 44880: 10299