From 2d7e0de5ea7a2923708006bc58dae4b35b65fe63 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Mon, 2 Feb 2009 13:50:53 -0500
Subject: Get merged tree into an installalble state.

I have only tested the all, rpms and *clean targets directly.
install may work but the rpm moves a lot of things around for us.

The Apache configuration file isn't in its final state but it works
with the new mod_python configuration.
---
 install/conf/Makefile.am | 15 +++++++++++++++
 install/conf/ipa.conf    | 15 +++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 install/conf/Makefile.am

(limited to 'install/conf')

diff --git a/install/conf/Makefile.am b/install/conf/Makefile.am
new file mode 100644
index 000000000..e00ad618f
--- /dev/null
+++ b/install/conf/Makefile.am
@@ -0,0 +1,15 @@
+NULL =
+
+appdir = $(IPA_DATA_DIR)
+app_DATA =                              \
+	ipa.conf			\
+	ipa-rewrite.conf		\
+	$(NULL)
+
+EXTRA_DIST =                            \
+        $(app_DATA)                     \
+        $(NULL)
+
+MAINTAINERCLEANFILES =                  \
+        *~                              \
+        Makefile.in
diff --git a/install/conf/ipa.conf b/install/conf/ipa.conf
index 85b4543af..9656fdf35 100644
--- a/install/conf/ipa.conf
+++ b/install/conf/ipa.conf
@@ -4,6 +4,7 @@
 # LoadModule auth_kerb_module modules/mod_auth_kerb.so
 
 ProxyRequests Off
+PythonImport ipaserver main_interpreter
 
 # ipa-rewrite.conf is loaded separately
 
@@ -34,16 +35,13 @@ AddType application/java-archive        jar
 ProxyPass /ipa/ui http://localhost:8080/ipa/ui
 ProxyPassReverse /ipa/ui http://localhost:8080/ipa/ui
 
-# Configure the XML-RPC service
-Alias /ipa/xml "/usr/share/ipa/ipaserver/XMLRPC"
-
 # This is where we redirect on failed auth
 Alias /ipa/errors "/usr/share/ipa/html"
 
 # For the MIT Windows config files
 Alias /ipa/config "/usr/share/ipa/html"
 
-<Directory "/usr/share/ipa/ipaserver">
+<Location "/ipa/xml">
   AuthType Kerberos
   AuthName "Kerberos Login"
   KrbMethodNegotiate on
@@ -55,16 +53,17 @@ Alias /ipa/config "/usr/share/ipa/html"
   Require valid-user
   ErrorDocument 401 /ipa/errors/unauthorized.html
 
-  SetHandler mod_python
-  PythonHandler ipaxmlrpc
-  
+  SetHandler python-program
+  PythonInterpreter main_interpreter
+  PythonHandler ipaserver::xmlrpc
+
   PythonDebug Off
 
   PythonOption IPADebug Off
 
   # this is pointless to use since it would just reload ipaxmlrpc.py
   PythonAutoReload Off
-</Directory>
+</Location>
 
 # Do no authentication on the directory that contains error messages
 <Directory "/usr/share/ipa/html">
-- 
cgit