URL: https://github.com/freeipa/freeipa/pull/2726 Author: rcritten Title: #2726: Remove 389-ds templates now that lib389 is used for installs Action: opened
PR body: """ The templates created the inf files for calling the 389-ds installer setup-ds.pl. Now that lib389 is being used for installation these are no longer necessary. Related: https://pagure.io/freeipa/issue/4491 Signed-off-by: Rob Crittenden <rcrit...@redhat.com> """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/2726/head:pr2726 git checkout pr2726
From 99db525bf2507ed8a7a3405cacf70988e396480e Mon Sep 17 00:00:00 2001 From: Rob Crittenden <rcrit...@redhat.com> Date: Fri, 4 Jan 2019 11:40:09 -0500 Subject: [PATCH] Remove 389-ds templates now that lib389 is used for installs The templates created the inf files for calling the 389-ds installer setup-ds.pl. Now that lib389 is being used for installation these are no longer necessary. Related: https://pagure.io/freeipa/issue/4491 Signed-off-by: Rob Crittenden <rcrit...@redhat.com> --- ipaserver/install/cainstance.py | 17 ----------------- ipaserver/install/dsinstance.py | 26 -------------------------- 2 files changed, 43 deletions(-) diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index cf0babe2cc..48479f30c7 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -72,23 +72,6 @@ logger = logging.getLogger(__name__) -# We need to reset the template because the CA uses the regular boot -# information -INF_TEMPLATE = """ -[General] -FullMachineName= $FQDN -SuiteSpotUserID= $USER -SuiteSpotGroup= $GROUP -ServerRoot= $SERVER_ROOT -[slapd] -ServerPort= $DSPORT -ServerIdentifier= $SERVERID -Suffix= $SUFFIX -RootDN= cn=Directory Manager -RootDNPwd= $PASSWORD -ConfigFile = /usr/share/pki/ca/conf/database.ldif -""" - ADMIN_GROUPS = [ 'Enterprise CA Administrators', diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 05b8daa50d..a64b6b6d22 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -186,32 +186,6 @@ def get_all_external_schema_files(root): return sorted(f) -INF_TEMPLATE = """ -[General] -FullMachineName= $FQDN -SuiteSpotUserID= $USER -SuiteSpotGroup= $GROUP -ServerRoot= $SERVER_ROOT -[slapd] -ServerPort= 389 -ServerIdentifier= $SERVERID -Suffix= $SUFFIX -RootDN= cn=Directory Manager -RootDNPwd= $PASSWORD -InstallLdifFile= /var/lib/dirsrv/boot.ldif -inst_dir= /var/lib/dirsrv/scripts-$SERVERID -""" - -BASE_TEMPLATE = """ -dn: $SUFFIX -objectClass: top -objectClass: domain -objectClass: pilotObject -dc: $BASEDC -info: IPA V2.0 -""" - - class DsInstance(service.Service): def __init__(self, realm_name=None, domain_name=None, fstore=None, domainlevel=None, config_ldif=None):
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org
