summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/RHEL4/ipa-client-setup8
-rwxr-xr-xinstall/tools/ipa-replica-install8
-rwxr-xr-xinstall/tools/ipa-server-install9
-rw-r--r--ipa.spec.in9
-rw-r--r--ipapython/README2
-rw-r--r--ipapython/config.py24
-rw-r--r--ipapython/setup.py.in1
7 files changed, 24 insertions, 37 deletions
diff --git a/contrib/RHEL4/ipa-client-setup b/contrib/RHEL4/ipa-client-setup
index 8e66ffdc8..8f43cc84b 100644
--- a/contrib/RHEL4/ipa-client-setup
+++ b/contrib/RHEL4/ipa-client-setup
@@ -269,14 +269,14 @@ def main():
opts = [{'name':'comment', 'type':'comment', 'value':'File modified by ipa-client-install'},
{'name':'empty', 'type':'empty'}]
- #[defaults]
- defopts = [{'name':'server', 'type':'option', 'value':ipasrv.getServerName()},
+ #[global]
+ defopts = [{'name':'xmlrpc_uri', 'type':'option', 'value':'https://%s/ipa/xml' % ipasrv.getServerName()},
{'name':'realm', 'type':'option', 'value':ipasrv.getRealmName()}]
- opts.append({'name':'defaults', 'type':'section', 'value':defopts})
+ opts.append({'name':'global', 'type':'section', 'value':defopts})
opts.append({'name':'empty', 'type':'empty'})
- ipaconf.newConf("/etc/ipa/ipa.conf", opts)
+ ipaconf.newConf("/etc/ipa/default.conf", opts)
# Configure ldap.conf
ldapconf = ipachangeconf.IPAChangeConf("IPA Installer")
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index e8fabd705..ae6137d01 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -349,14 +349,6 @@ def main():
CA.fix_ra_perms()
service.restart("httpd")
- # Create the config file
- fd = open("/etc/ipa/ipa.conf", "w")
- fd.write("[defaults]\n")
- fd.write("server=" + config.host_name + "\n")
- fd.write("realm=" + config.realm_name + "\n")
- fd.write("domain=" + config.domain_name + "\n")
- fd.close()
-
# Create the management framework config file
fd = open("/etc/ipa/default.conf", "w")
fd.write("[global]\n")
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 0b2660f3a..63bb3590a 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -751,15 +751,6 @@ def main():
http.create_instance(realm_name, host_name, domain_name, autoconfig=True, self_signed_ca=not options.ca)
ipautil.run(["/sbin/restorecon", "/var/cache/ipa/sessions"])
- # Create the config file
- fstore.backup_file("/etc/ipa/ipa.conf")
- fd = open("/etc/ipa/ipa.conf", "w")
- fd.write("[defaults]\n")
- fd.write("server=" + host_name + "\n")
- fd.write("realm=" + realm_name + "\n")
- 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")
diff --git a/ipa.spec.in b/ipa.spec.in
index ea22cdddb..ed2183d98 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -270,7 +270,7 @@ ln -s ../../../..%{_sysconfdir}/ipa/html/unauthorized.html \
# So we can own our Apache configuration
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ipa/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
-/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/ipa/ipa.conf
+/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/ipa/default.conf
/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa.conf
/bin/touch $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
%endif
@@ -386,7 +386,7 @@ fi
%dir %{_sysconfdir}/ipa/html
%config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
%config(noreplace) %{_sysconfdir}/ipa/html/unauthorized.html
-%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ipa.conf
+%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa.conf
%{_usr}/share/ipa/ipa.conf
@@ -460,7 +460,7 @@ fi
%{python_sitelib}/ipapython-*.egg-info
%{python_sitelib}/freeipa-*.egg-info
%endif
-%config(noreplace) %{_sysconfdir}/ipa/ipa.conf
+%config(noreplace) %{_sysconfdir}/ipa/default.conf
%if %{WITH_RADIUS}
%files radius-server
@@ -482,6 +482,9 @@ fi
%endif
%changelog
+* Wed Nov 25 2009 Rob Crittenden <rcritten@redhat.com> - 1.99-11
+- Remove v1-style /etc/ipa/ipa.conf, replacing with /etc/ipa/default.conf
+
* Fri Nov 13 2009 Rob Crittenden <rcritten@redhat.com> - 1.99-10
- Add bash completion script and own /etc/bash_completion.d in case it
doesn't already exist
diff --git a/ipapython/README b/ipapython/README
index c966e44bf..c1db2996b 100644
--- a/ipapython/README
+++ b/ipapython/README
@@ -5,7 +5,7 @@ A brief overview:
config.py - identify the IPA server domain and realm. It uses dnsclient to
try to detect this information first and will fall back to
- /etc/ipa/ipa.conf if that fails.
+ /etc/ipa/default.conf if that fails.
dnsclient.py - find IPA information via DNS
ipautil.py - helper functions
diff --git a/ipapython/config.py b/ipapython/config.py
index efae910eb..f3532c479 100644
--- a/ipapython/config.py
+++ b/ipapython/config.py
@@ -24,6 +24,7 @@ import krbV
import socket
import ipapython.dnsclient
import re
+import urlparse
class IPAConfigError(Exception):
def __init__(self, msg=''):
@@ -88,22 +89,23 @@ config = IPAConfig()
def __parse_config(discover_server = True):
p = ConfigParser.SafeConfigParser()
- p.read("/etc/ipa/ipa.conf")
+ p.read("/etc/ipa/default.conf")
try:
if not config.default_realm:
- config.default_realm = p.get("defaults", "realm")
+ config.default_realm = p.get("global", "realm")
except:
pass
if discover_server:
try:
- s = p.get("defaults", "server")
- config.default_server.extend(re.sub("\s+", "", s).split(','))
+ s = p.get("global", "xmlrpc_uri")
+ server = urlparse.urlsplit(s)
+ config.default_server.extend(server.netloc)
except:
pass
try:
if not config.default_domain:
- config.default_domain = p.get("defaults", "domain")
+ config.default_domain = p.get("global", "domain")
except:
pass
@@ -128,7 +130,7 @@ def __discover_config(discover_server = True):
while rl == 0:
tok = dom_name.find(".")
if tok == -1:
- return False
+ return False
dom_name = dom_name[tok+1:]
name = "_ldap._tcp." + dom_name + "."
rs = ipapython.dnsclient.query(name, ipapython.dnsclient.DNS_C_IN, ipapython.dnsclient.DNS_T_SRV)
@@ -138,8 +140,8 @@ def __discover_config(discover_server = True):
if discover_server:
if rl == 0:
- name = "_ldap._tcp."+config.default_domain+"."
- rs = ipapython.dnsclient.query(name, ipapython.dnsclient.DNS_C_IN, ipapython.dnsclient.DNS_T_SRV)
+ name = "_ldap._tcp."+config.default_domain+"."
+ rs = ipapython.dnsclient.query(name, ipapython.dnsclient.DNS_C_IN, ipapython.dnsclient.DNS_T_SRV)
for r in rs:
if r.dns_type == ipapython.dnsclient.DNS_T_SRV:
@@ -176,8 +178,8 @@ def init_config(options=None):
config.default_server = new_server
if not config.default_realm:
- raise IPAConfigError("IPA realm not found in DNS, in the config file (/etc/ipa/ipa.conf) or on the command line.")
+ raise IPAConfigError("IPA realm not found in DNS, in the config file (/etc/ipa/default.conf) or on the command line.")
if not config.default_server:
- raise IPAConfigError("IPA server not found in DNS, in the config file (/etc/ipa/ipa.conf) or on the command line.")
+ raise IPAConfigError("IPA server not found in DNS, in the config file (/etc/ipa/default.conf) or on the command line.")
if not config.default_domain:
- raise IPAConfigError("IPA domain not found in the config file (/etc/ipa/ipa.conf) or on the command line.")
+ raise IPAConfigError("IPA domain not found in the config file (/etc/ipa/default.conf) or on the command line.")
diff --git a/ipapython/setup.py.in b/ipapython/setup.py.in
index 667c5ae00..99af2a7c5 100644
--- a/ipapython/setup.py.in
+++ b/ipapython/setup.py.in
@@ -66,7 +66,6 @@ def setup_package():
platforms = ["Linux", "Solaris", "Unix"],
package_dir = {'ipapython': ''},
packages = [ "ipapython" ],
- data_files = [('/etc/ipa', ['ipa.conf'])]
)
finally:
del sys.path[0]
generated by cgit (git 2.34.1) at 2024-04-20 08:36:54 +0000