summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/replication.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-01-21 06:43:29 -0500
committerMartin Kosek <mkosek@redhat.com>2013-03-01 16:59:44 +0100
commit8be8d4ebfd876aba109ea133efe11d2386564f3b (patch)
tree2ce30f81c461ae87a8329579704363e2ca48aa06 /ipaserver/install/replication.py
parent1960945e28e467c18454f27e0839d124473a68cc (diff)
downloadfreeipa.git-8be8d4ebfd876aba109ea133efe11d2386564f3b.tar.gz
freeipa.git-8be8d4ebfd876aba109ea133efe11d2386564f3b.tar.xz
freeipa.git-8be8d4ebfd876aba109ea133efe11d2386564f3b.zip
Remove dbdir, binddn, bindpwd from IPAdmin
The dbdir logic was moved to replication.py, the only caller. The binddn and bindpwd attributes were unused. Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install/replication.py')
-rw-r--r--ipaserver/install/replication.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index c28fa890..1555fb99 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -19,6 +19,7 @@
import time
import sys
+import os
import ldap
@@ -355,12 +356,19 @@ class ReplicationManager(object):
conn.addEntry(entry)
def setup_changelog(self, conn):
+ ent = conn.get_entry(
+ DN(
+ ('cn', 'config'), ('cn', 'ldbm database'),
+ ('cn', 'plugins'), ('cn', 'config')),
+ ['nsslapd-directory'])
+ dbdir = os.path.dirname(ent.getValue('nsslapd-directory'))
+
entry = conn.make_entry(
DN(('cn', 'changelog5'), ('cn', 'config')),
{
'objectclass': ["top", "extensibleobject"],
'cn': ["changelog5"],
- 'nsslapd-changelogdir': [conn.dbdir + "/cldb"],
+ 'nsslapd-changelogdir': [os.path.join(dbdir, "cldb")],
}
)
try: