Remove some duplicated code that was moved to ipaserver and use it Remove some unused files

This commit is contained in:
Rob Crittenden
2009-02-04 10:53:34 -05:00
parent baef3003bc
commit 6b34f07720
15 changed files with 59 additions and 1917 deletions

View File

@@ -28,8 +28,8 @@ try:
from optparse import OptionParser
from ipaserver import ipaldap
from ipa import entity, ipaerror, ipautil, config
from ipaserver import installutils
from ipaserver.ldapupdate import LDAPUpdate, BadSyntax, UPDATES_DIR
from ipaserver.install import installutils
from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax, UPDATES_DIR
import ldap
import logging
import re

9
install/tools/ipa-replica-install Normal file → Executable file
View File

@@ -26,8 +26,9 @@ import ldap
from ipa import ipautil
from ipaserver import dsinstance, replication, installutils, krbinstance, service
from ipaserver import httpinstance, ntpinstance, certs, ipaldap
from ipaserver.install import dsinstance, replication, installutils, krbinstance, service
from ipaserver.install import httpinstance, ntpinstance, certs
from ipaserver import ipaldap
from ipa import version
CACERT="/usr/share/ipa/html/ca.crt"
@@ -266,10 +267,6 @@ def main():
fd.write("domain=" + config.domain_name + "\n")
fd.close()
# Create a Web Gui instance
webgui = httpinstance.WebGuiInstance()
webgui.create_instance()
# Apply any LDAP updates. Needs to be done after the replica is synced-up
service.print_msg("Applying LDAP updates")
ds.apply_updates()

3
install/tools/ipa-replica-prepare Normal file → Executable file
View File

@@ -28,7 +28,8 @@ from optparse import OptionParser
import ipa.config
from ipa import ipautil
from ipaserver import dsinstance, installutils, certs, ipaldap
from ipaserver.install import dsinstance, installutils, certs
from ipaserver import ipaldap
from ipa import version
import ldap

View File

@@ -49,6 +49,7 @@ from ipaserver.install.installutils import *
from ipa import sysrestore
from ipa.ipautil import *
from ipalib import util
pw_name = None
@@ -531,6 +532,16 @@ def main():
fd.write("domain=" + domain_name + "\n")
fd.close()
# Create the management framework config file
fstore.backup_file("/etc/ipa/default.conf")
fd = open("/etc/ipa/default.conf", "w")
fd.write("[global]\n")
fd.write("basedn=" + util.realm_to_suffix(realm_name) + "\n")
fd.write("realm=" + realm_name + "\n")
fd.write("domain=" + domain_name + "\n")
fd.write("xmlrpc_uri=https://%s/ipa/xml\n" % host_name)
fd.close()
bind = bindinstance.BindInstance(fstore)
bind.setup(host_name, ip_address, realm_name, domain_name)
if options.setup_bind: