mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Re-add function façades removed by commit 2da9088
.
ansible-freeipa breaks if this functions do not exist, so they will be added back and marked as deprecated. Related Tickets: https://pagure.io/freeipa/issue/8062 Signed-off-by: Rafael Guterres Jeffman <rjeffman@redhat.com> Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
parent
78d27f8252
commit
9c20641f5c
@ -28,6 +28,7 @@ import sys
|
|||||||
import tempfile
|
import tempfile
|
||||||
import time
|
import time
|
||||||
import traceback
|
import traceback
|
||||||
|
import warnings
|
||||||
|
|
||||||
from configparser import RawConfigParser
|
from configparser import RawConfigParser
|
||||||
from urllib.parse import urlparse, urlunparse
|
from urllib.parse import urlparse, urlunparse
|
||||||
@ -281,6 +282,36 @@ def is_ipa_client_installed(fstore, on_master=False):
|
|||||||
return installed
|
return installed
|
||||||
|
|
||||||
|
|
||||||
|
def configure_nsswitch_database(fstore, database, services, preserve=True,
|
||||||
|
append=True, default_value=()):
|
||||||
|
"""
|
||||||
|
This function was deprecated. Use ipaplatform.tasks.
|
||||||
|
|
||||||
|
Edits the specified nsswitch.conf database (e.g. passwd, group, sudoers)
|
||||||
|
to use the specified service(s).
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
fstore - FileStore to backup the nsswitch.conf
|
||||||
|
database - database configuration that should be ammended,
|
||||||
|
e.g. 'sudoers'
|
||||||
|
service - list of services that should be added, e.g. ['sss']
|
||||||
|
preserve - if True, the already configured services will be preserved
|
||||||
|
|
||||||
|
The next arguments modify the behaviour if preserve=True:
|
||||||
|
append - if True, the services will be appended, if False, prepended
|
||||||
|
default_value - list of services that are considered as default (if
|
||||||
|
the database is not mentioned in nsswitch.conf), e.g.
|
||||||
|
['files']
|
||||||
|
"""
|
||||||
|
warnings.warn(
|
||||||
|
"Use ipaplatform.tasks.tasks.configure_nsswitch_database",
|
||||||
|
DeprecationWarning,
|
||||||
|
stacklevel=2
|
||||||
|
)
|
||||||
|
return tasks.configure_nsswitch_database(fstore, database, services,
|
||||||
|
preserve, append, default_value)
|
||||||
|
|
||||||
|
|
||||||
def configure_ipa_conf(
|
def configure_ipa_conf(
|
||||||
fstore, cli_basedn, cli_realm, cli_domain, cli_server, hostname):
|
fstore, cli_basedn, cli_realm, cli_domain, cli_server, hostname):
|
||||||
ipaconf = IPAChangeConf("IPA Installer")
|
ipaconf = IPAChangeConf("IPA Installer")
|
||||||
|
@ -29,6 +29,7 @@ import shutil
|
|||||||
import time
|
import time
|
||||||
import tempfile
|
import tempfile
|
||||||
import gssapi
|
import gssapi
|
||||||
|
import warnings
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from xml.etree import cElementTree as etree
|
from xml.etree import cElementTree as etree
|
||||||
@ -178,6 +179,21 @@ def configure_xml(fstore):
|
|||||||
print("Configured %s" % authconf)
|
print("Configured %s" % authconf)
|
||||||
|
|
||||||
|
|
||||||
|
def configure_nsswitch(statestore, options):
|
||||||
|
"""
|
||||||
|
This function was deprecated. Use ipaplatform.tasks.
|
||||||
|
|
||||||
|
Point automount to ldap in nsswitch.conf.
|
||||||
|
This function is for non-SSSD setups only.
|
||||||
|
"""
|
||||||
|
warnings.warn(
|
||||||
|
"Use ipaplatform.tasks.tasks.enable_ldap_automount",
|
||||||
|
DeprecationWarning,
|
||||||
|
stacklevel=2
|
||||||
|
)
|
||||||
|
return tasks.enable_ldap_automount(statestore)
|
||||||
|
|
||||||
|
|
||||||
def configure_autofs_sssd(fstore, statestore, autodiscover, options):
|
def configure_autofs_sssd(fstore, statestore, autodiscover, options):
|
||||||
try:
|
try:
|
||||||
sssdconfig = SSSDConfig.SSSDConfig()
|
sssdconfig = SSSDConfig.SSSDConfig()
|
||||||
|
Loading…
Reference in New Issue
Block a user