IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove working directory for bind-dyndb-ldap plugin.

Browse Source 
The working directory will be provided directly
by bind-dyndb-ldap package.

This partially reverts commit 689382dc83.

https://fedorahosted.org/freeipa/ticket/3967
This commit is contained in:
Petr Spacek
2014-01-27 14:47:10 +01:00
committed by Petr Viktorin
parent 04627b72d6
commit c919363538
3 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
freeipa.spec.in
View File

@@ -767,7 +767,6 @@ fi
%{_mandir}/man1/ipa-backup.1.gz %{_mandir}/man1/ipa-backup.1.gz
%{_mandir}/man1/ipa-restore.1.gz %{_mandir}/man1/ipa-restore.1.gz
%{_mandir}/man1/ipa-advise.1.gz %{_mandir}/man1/ipa-advise.1.gz
%ghost %{_localstatedir}/named/ipa
%files server-trust-ad %files server-trust-ad
%{_sbindir}/ipa-adtrust-install %{_sbindir}/ipa-adtrust-install

5
install/tools/ipa-upgradeconfig
View File

@@ -1084,10 +1084,6 @@ def main():
setup_firefox_extension(fstore) setup_firefox_extension(fstore)
add_ca_dns_records() 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 # Any of the following functions returns True iff the named.conf file
# has been altered # has been altered
named_conf_changes = ( named_conf_changes = (
@@ -1101,6 +1097,7 @@ def main():
if any(named_conf_changes): if any(named_conf_changes):
# configuration has changed, restart the name server # configuration has changed, restart the name server
root_logger.info('Changes to named.conf have been made, restart named') root_logger.info('Changes to named.conf have been made, restart named')
bind = bindinstance.BindInstance(fstore)
try: try:
bind.restart() bind.restart()
except ipautil.CalledProcessError, e: except ipautil.CalledProcessError, e:

13
ipaserver/install/bindinstance.py
View File

@@ -22,7 +22,6 @@ import os
import pwd import pwd
import netaddr import netaddr
import re import re
import errno
import ldap import ldap
@@ -510,16 +509,6 @@ class BindInstance(service.Service):
os.close(bind_fd) os.close(bind_fd)
print "Sample zone file for bind has been created in "+bind_name 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): def create_instance(self):
try: try:
@@ -530,8 +519,6 @@ class BindInstance(service.Service):
# get a connection to the DS # get a connection to the DS
self.ldap_connect() self.ldap_connect()
self.create_dir('/var/named/ipa', 0700)
if installutils.record_in_hosts(self.ip_address, self.fqdn) is None: if installutils.record_in_hosts(self.ip_address, self.fqdn) is None:
installutils.add_record_to_hosts(self.ip_address, self.fqdn) installutils.add_record_to_hosts(self.ip_address, self.fqdn)