/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-ctl

  • Committer: teddy at recompile
  • Date: 2020-02-07 20:53:34 UTC
  • Revision ID: teddy@recompile.se-20200207205334-dp41p8c8vw0ytik5
Allow users to more easily alter mandos.service

The sysvinit script uses /etc/default/mandos as an environment file,
and supports adding additional server options to a DAEMON_ARGS
environment variable.  This should be supported by the systemd
service, too.

* mandos.service ([Service]/EnvironmentFile): New; set to
  "/etc/default/mandos ".
  ([Service]/ExecStart): Append "$DAEMON_ARGS".

Show diffs side-by-side

added added

removed removed

Lines of Context:
1632
1632
        finally:
1633
1633
            dbus_logger.removeFilter(counting_handler)
1634
1634
 
1635
 
        self.assertNotIsInstance(e, dbus.ConnectFailed)
 
1635
        self.assertNotIsInstance(e.exception, dbus.ConnectFailed)
1636
1636
 
1637
1637
        # Make sure the dbus logger was suppressed
1638
1638
        self.assertEqual(0, counting_handler.count)
1775
1775
            self.call_method(bus, "methodname", "busname",
1776
1776
                             "objectpath", "interface")
1777
1777
 
1778
 
        self.assertNotIsInstance(e, dbus.ConnectFailed)
 
1778
        self.assertNotIsInstance(e.exception, dbus.ConnectFailed)
1779
1779
 
1780
1780
    def test_get_converts_to_correct_exception(self):
1781
1781
        bus = pydbus_adapter.SystemBus(