3 files changed, 14 insertions, 12 deletions
diff --git a/ipa-server/xmlrpc-server/Makefile.am b/ipa-server/xmlrpc-server/Makefile.am
index cf142019..49457ba4 100644
--- a/ipa-server/xmlrpc-server/Makefile.am
+++ b/ipa-server/xmlrpc-server/Makefile.am
@@ -24,6 +24,7 @@ server_PYTHON =			\
 appdir = $(IPA_DATA_DIR)
 app_DATA =			\
 	ipa.conf		\
+	ipa-rewrite.conf	\
 	$(NULL)
 
 EXTRA_DIST =			\
diff --git a/ipa-server/xmlrpc-server/ipa-rewrite.conf b/ipa-server/xmlrpc-server/ipa-rewrite.conf
new file mode 100644
index 00000000..977be739
--- /dev/null
+++ b/ipa-server/xmlrpc-server/ipa-rewrite.conf
@@ -0,0 +1,12 @@
+RewriteEngine on
+
+# Redirect to the fully-qualified hostname. Not redirecting to secure
+# port so configuration files can be retrieved without requiring SSL.
+RewriteCond %{HTTP_HOST}    !^$FQDN$$ [NC]
+RewriteRule ^/(.*)          http://$FQDN/$$1 [L,R=301]
+
+# Redirect to the secure port if not displaying an error or retrieving
+# configuration.
+RewriteCond %{SERVER_PORT}  !^443$$
+RewriteCond %{REQUEST_URI}  !^/(errors|config|favicon.ico)
+RewriteRule ^/(.*)          https://$FQDN/$$1 [L,R=301,NC]
diff --git a/ipa-server/xmlrpc-server/ipa.conf b/ipa-server/xmlrpc-server/ipa.conf
index 4e8bf528..10c9b5ec 100644
--- a/ipa-server/xmlrpc-server/ipa.conf
+++ b/ipa-server/xmlrpc-server/ipa.conf
@@ -2,18 +2,7 @@
 
 ProxyRequests Off
 
-RewriteEngine on
-
-# Redirect to the fully-qualified hostname. Not redirecting to secure
-# port so configuration files can be retrieved without requiring SSL.
-RewriteCond %{HTTP_HOST}    !^$FQDN$$ [NC]
-RewriteRule ^/(.*)          http://$FQDN/$$1 [L,R=301]
-
-# Redirect to the secure port if not displaying an error or retrieving
-# configuration.
-RewriteCond %{SERVER_PORT}  !^443$$
-RewriteCond %{REQUEST_URI}  !^/(errors|config|favicon.ico)
-RewriteRule ^/(.*)          https://$FQDN/$$1 [L,R=301,NC]
+# ipa-rewrite.conf is loaded separately
 
 # This is required so the auto-configuration works with Firefox 2+
 AddType application/java-archive        jar