94 lines
3.1 KiB
Diff
94 lines
3.1 KiB
Diff
|
From 916437b391739ea3ee48dfcd9f0d164536ca9ead Mon Sep 17 00:00:00 2001
|
||
|
|
From: Petr Spacek <pspacek@redhat.com>
|
||
|
|
Date: Mon, 27 Jan 2014 14:47:10 +0100
|
||
|
|
Subject: [PATCH 8/9] Remove working directory for bind-dyndb-ldap plugin.
|
||
|
|
|
||
|
|
The working directory will be provided directly
|
||
|
|
by bind-dyndb-ldap package.
|
||
|
|
|
||
|
|
This partially reverts commit 689382dc833e687d30349b10a8fd7dc740d54d08.
|
||
|
|
|
||
|
|
https://fedorahosted.org/freeipa/ticket/3967
|
||
|
|
---
|
||
|
|
freeipa.spec.in | 1 -
|
||
|
|
install/tools/ipa-upgradeconfig | 5 +----
|
||
|
|
ipaserver/install/bindinstance.py | 13 -------------
|
||
|
|
3 files changed, 1 insertion(+), 18 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/freeipa.spec.in b/freeipa.spec.in
|
||
|
|
index ef96c7c271ebba33b15d9b35891092e4151c3aae..eb9afbb4bfa1a11caf1282d5b76c2e138735386c 100644
|
||
|
|
--- a/freeipa.spec.in
|
||
|
|
+++ b/freeipa.spec.in
|
||
|
|
@@ -764,7 +764,6 @@ fi
|
||
|
|
%{_mandir}/man1/ipa-backup.1.gz
|
||
|
|
%{_mandir}/man1/ipa-restore.1.gz
|
||
|
|
%{_mandir}/man1/ipa-advise.1.gz
|
||
|
|
-%ghost %{_localstatedir}/named/ipa
|
||
|
|
|
||
|
|
%files server-trust-ad
|
||
|
|
%{_sbindir}/ipa-adtrust-install
|
||
|
|
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
|
||
|
|
index 5bcef1ac827da296c6a35e8fc29a1c6f0a04f808..cf9fe0e040e56bb75ca8d53e28586911caeffb2b 100644
|
||
|
|
--- a/install/tools/ipa-upgradeconfig
|
||
|
|
+++ b/install/tools/ipa-upgradeconfig
|
||
|
|
@@ -1084,10 +1084,6 @@ def main():
|
||
|
|
setup_firefox_extension(fstore)
|
||
|
|
add_ca_dns_records()
|
||
|
|
|
||
|
|
- bind = bindinstance.BindInstance(fstore)
|
||
|
|
- if bind.is_configured():
|
||
|
|
- bind.create_dir('/var/named/ipa', 0700)
|
||
|
|
-
|
||
|
|
# Any of the following functions returns True iff the named.conf file
|
||
|
|
# has been altered
|
||
|
|
named_conf_changes = (
|
||
|
|
@@ -1101,6 +1097,7 @@ def main():
|
||
|
|
if any(named_conf_changes):
|
||
|
|
# configuration has changed, restart the name server
|
||
|
|
root_logger.info('Changes to named.conf have been made, restart named')
|
||
|
|
+ bind = bindinstance.BindInstance(fstore)
|
||
|
|
try:
|
||
|
|
bind.restart()
|
||
|
|
except ipautil.CalledProcessError, e:
|
||
|
|
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
|
||
|
|
index 4baeb4e077c64a7abebd1c071012f6c1e02dc1ae..6d5a1d44d30c89278c24fe7ab5278355cb65b0b4 100644
|
||
|
|
--- a/ipaserver/install/bindinstance.py
|
||
|
|
+++ b/ipaserver/install/bindinstance.py
|
||
|
|
@@ -22,7 +22,6 @@
|
||
|
|
import pwd
|
||
|
|
import netaddr
|
||
|
|
import re
|
||
|
|
-import errno
|
||
|
|
|
||
|
|
import ldap
|
||
|
|
|
||
|
|
@@ -510,16 +509,6 @@ def create_sample_bind_zone(self):
|
||
|
|
os.close(bind_fd)
|
||
|
|
print "Sample zone file for bind has been created in "+bind_name
|
||
|
|
|
||
|
|
- def create_dir(self, path, mode):
|
||
|
|
- try:
|
||
|
|
- os.makedirs(path, mode)
|
||
|
|
- except OSError as e:
|
||
|
|
- if e.errno != errno.EEXIST:
|
||
|
|
- raise e
|
||
|
|
-
|
||
|
|
- pent = pwd.getpwnam(self.named_user or 'named')
|
||
|
|
- os.chown(path, pent.pw_uid, pent.pw_gid)
|
||
|
|
-
|
||
|
|
def create_instance(self):
|
||
|
|
|
||
|
|
try:
|
||
|
|
@@ -530,8 +519,6 @@ def create_instance(self):
|
||
|
|
# get a connection to the DS
|
||
|
|
self.ldap_connect()
|
||
|
|
|
||
|
|
- self.create_dir('/var/named/ipa', 0700)
|
||
|
|
-
|
||
|
|
if installutils.record_in_hosts(self.ip_address, self.fqdn) is None:
|
||
|
|
installutils.add_record_to_hosts(self.ip_address, self.fqdn)
|
||
|
|
|
||
|
|
--
|
||
|
|
1.8.5.3
|
||
|
|
|