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

users: Move dpkg reconfigure to action utils

Browse Source 
In the hope that it will be useful to other actions.  Also delete the
named temporary file after configuration.
This commit is contained in:
Sunil Mohan Adapa 2016-07-31 10:58:07 +05:30
parent 6c3d3888c1
commit 8e28afe160
No known key found for this signature in database
GPG Key ID: 36C361440C9BC971
2 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
actions/users
View File

@ -22,9 +22,7 @@ Configuration helper for the LDAP user directory
""" """
import argparse import argparse
import os
import subprocess import subprocess
import tempfile
import augeas import augeas
from plinth import action_utils from plinth import action_utils
@ -55,12 +53,13 @@ def subcommand_setup(_):
def configure_slapd(): def configure_slapd():
"""Configure LDAP authentication and basic structure.""" """Configure LDAP authentication and basic structure."""
_reconfigure('slapd', {'domain': 'thisbox'}) action_utils.dpkg_reconfigure('slapd', {'domain': 'thisbox'})
_reconfigure('nslcd', {'ldap-uris': 'ldapi:///', action_utils.dpkg_reconfigure('nslcd', {'ldap-uris': 'ldapi:///',
'ldap-base': 'dc=thisbox', 'ldap-base': 'dc=thisbox',
'ldap-auth-type': 'SASL', 'ldap-auth-type': 'SASL',
'ldap-sasl-mech': 'EXTERNAL'}) 'ldap-sasl-mech': 'EXTERNAL'})
_reconfigure('libnss-ldapd', {'nsswitch': 'group, passwd, shadow'}) action_utils.dpkg_reconfigure('libnss-ldapd',
{'nsswitch': 'group, passwd, shadow'})
was_running = action_utils.service_is_running('slapd') was_running = action_utils.service_is_running('slapd')
if not was_running: if not was_running:
@ -147,29 +146,6 @@ def configure_ldapscripts():
aug.save() aug.save()
def _reconfigure(package, config):
"""Reconfigure package using debconf database override."""
override_template = '''
Name: {package}/{key}
Template: {package}/{key}
Value: {value}
Owners: {package}
'''
override_data = ''
for key, value in config.items():
override_data += override_template.format(
package=package, key=key, value=value)
with tempfile.NamedTemporaryFile(mode='w', delete=False) as override_file:
override_file.write(override_data)
env = os.environ.copy()
env['DEBCONF_DB_OVERRIDE'] = 'File{' + override_file.name + \
' readonly:true}'
env['DEBIAN_FRONTEND'] = 'noninteractive'
subprocess.run(['dpkg-reconfigure', package], env=env)
def main(): def main():
"""Parse arguments and perform all duties""" """Parse arguments and perform all duties"""
arguments = parse_arguments() arguments = parse_arguments()

29
plinth/action_utils.py
View File

@ -26,6 +26,7 @@ import logging
import psutil import psutil
import socket import socket
import subprocess import subprocess
import tempfile
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -417,3 +418,31 @@ def get_ip_addresses():
def get_hostname(): def get_hostname():
"""Return the current hostname.""" """Return the current hostname."""
return subprocess.check_output(['hostname']).decode().strip() return subprocess.check_output(['hostname']).decode().strip()
def dpkg_reconfigure(package, config):
"""Reconfigure package using debconf database override."""
override_template = '''
Name: {package}/{key}
Template: {package}/{key}
Value: {value}
Owners: {package}
'''
override_data = ''
for key, value in config.items():
override_data += override_template.format(
package=package, key=key, value=value)
with tempfile.NamedTemporaryFile(mode='w', delete=False) as override_file:
override_file.write(override_data)
env = os.environ.copy()
env['DEBCONF_DB_OVERRIDE'] = 'File{' + override_file.name + \
' readonly:true}'
env['DEBIAN_FRONTEND'] = 'noninteractive'
subprocess.run(['dpkg-reconfigure', package], env=env)
try:
os.remove(override_file)
except OSError:
pass