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

bind: Drop alias handling unnecessary in >= Bullseye

Browse Source 
Alias was added to deal with Buster -> Bullseye transition. In Buster the daemon
was named bind9 and in Bullseye the daemon is named named with alias to bind9.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2021-11-16 16:31:36 -08:00 committed by James Valleroy
parent 5b5249873d
commit 84ae338e66
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/bind
View File

@ -39,14 +39,14 @@ def subcommand_setup(arguments):
Path(ZONES_DIR).mkdir(exist_ok=True, parents=True) Path(ZONES_DIR).mkdir(exist_ok=True, parents=True)
action_utils.service_restart('bind9') action_utils.service_restart('named')
def subcommand_configure(arguments): def subcommand_configure(arguments):
"""Configure BIND.""" """Configure BIND."""
set_forwarders(arguments.forwarders) set_forwarders(arguments.forwarders)
set_dnssec(arguments.dnssec) set_dnssec(arguments.dnssec)
action_utils.service_restart('bind9') action_utils.service_restart('named')
def main(): def main():

5
plinth/modules/bind/__init__.py
View File

@ -23,7 +23,7 @@ from . import manifest
version = 2 version = 2
managed_services = ['bind9', 'named'] managed_services = ['named']
_description = [ _description = [
_('BIND enables you to publish your Domain Name System (DNS) information ' _('BIND enables you to publish your Domain Name System (DNS) information '
@ -96,8 +96,7 @@ class BindApp(app_module.App):
'daemon-bind', managed_services[0], listen_ports=[(53, 'tcp6'), 'daemon-bind', managed_services[0], listen_ports=[(53, 'tcp6'),
(53, 'udp6'), (53, 'udp6'),
(53, 'tcp4'), (53, 'tcp4'),
(53, 'udp4')], (53, 'udp4')])
alias=managed_services[1])
self.add(daemon) self.add(daemon)
backup_restore = BackupRestore('backup-restore-bind', backup_restore = BackupRestore('backup-restore-bind',

2
plinth/modules/bind/manifest.py
View File

@ -7,5 +7,5 @@ backup = {
'config': { 'config': {
'files': ['/etc/bind/named.conf.options'] 'files': ['/etc/bind/named.conf.options']
}, },
'services': ['bind9'] 'services': ['named']
} }