Attachment 300310 Details for Bug 440443 – Put everything IPA into /ipa

[patch] Put everything IPA into /ipa

freeipa-769-webroot.patch (text/plain), 12.96 KB, created by Rob Crittenden on 2008-04-03 19:23:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Crittenden

Created: 2008-04-03 19:23:16 UTC

Size: 12.96 KB

patch

obsolete

># HG changeset patch
># User Rob Crittenden <rcritten@redhat.com>
># Date 1207251944 14400
># Node ID 291dd09140175010afca78f7ffbc99376058e635
># Parent  b0c5924e106438a76154714ab6de830617914692
>Refine our web space some more so that everything we reference is in /ipa
>
>UI: /ipa/ui
>XML-RPC: /ipa/xml
>errors: /ipa/errors
>config: /ipa/config
>
>I had to hardcode that URI into the CSS pages but TurboGears handles the
>rest of the translations with tg.url().
>
>440443
>
>diff -r b0c5924e1064 -r 291dd0914017 ipa-python/rpcclient.py
>--- a/ipa-python/rpcclient.py	Thu Apr 03 15:40:11 2008 -0400
>+++ b/ipa-python/rpcclient.py	Thu Apr 03 15:45:44 2008 -0400
>@@ -37,7 +37,7 @@ class RPCClient:
>     
>     def server_url(self, server):
>         """Build the XML-RPC server URL from our configuration"""
>-        return "https://" + server + "/ipaxml"
>+        return "https://" + server + "/ipa/xml"
>     
>     def setup_server(self):
>         """Create our XML-RPC server connection using kerberos
>diff -r b0c5924e1064 -r 291dd0914017 ipa-server/ipa-gui/ipa_webgui.cfg
>--- a/ipa-server/ipa-gui/ipa_webgui.cfg	Thu Apr 03 15:40:11 2008 -0400
>+++ b/ipa-server/ipa-gui/ipa_webgui.cfg	Thu Apr 03 15:45:44 2008 -0400
>@@ -29,11 +29,11 @@ server.thread_pool = 10
> 
> # if this is part of a larger site, you can set the path
> # to the TurboGears instance here
>-server.webpath="/ipa"
>+server.webpath="/ipa/ui"
> 
> # Set to True if you are deploying your App behind a proxy
> # e.g. Apache using mod_proxy
>-# base_url_filter.on = False
>+base_url_filter.on = True
> 
> # Set to True if your proxy adds the x_forwarded_host header
> # base_url_filter.use_x_forwarded_host = True
>diff -r b0c5924e1064 -r 291dd0914017 ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css
>--- a/ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css	Thu Apr 03 15:40:11 2008 -0400
>+++ b/ipa-server/ipa-gui/ipagui/static/css/style_freeipa.css	Thu Apr 03 15:45:44 2008 -0400
>@@ -40,10 +40,10 @@
>   text-decoration: underline;
> }
> .sortasc {
>-  background-image: url(/static/images/up.gif) !important;
>+  background-image: url(/ipa/ui/static/images/up.gif) !important;
> }
> .sortdesc {
>-  background-image: url(/static/images/down.gif) !important;
>+  background-image: url(/ipa/ui/static/images/down.gif) !important;
> }
> 
> .warning_message {
>diff -r b0c5924e1064 -r 291dd0914017 ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css
>--- a/ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css	Thu Apr 03 15:40:11 2008 -0400
>+++ b/ipa-server/ipa-gui/ipagui/static/css/style_platform-objects.css	Thu Apr 03 15:45:44 2008 -0400
>@@ -1,19 +1,19 @@
> /* object h1 styles */
> 
>-#details h1.overview { background-image: url('/static/images/objects/object-overview.png'); }
>+#details h1.overview { background-image: url('/ipa/ui/static/images/objects/object-overview.png'); }
> 
>-#details h1.accesscontrol { background-image: url('/static/images/objects/object-accesscontrol.png'); }
>+#details h1.accesscontrol { background-image: url('/ipa/ui/static/images/objects/object-accesscontrol.png'); }
> 
>-#details h1.user { background-image: url('/static/images/objects/object-user.png'); }
>-#details h1.usergroup { background-image: url('/static/images/objects/object-usergroup.png'); }
>+#details h1.user { background-image: url('/ipa/ui/static/images/objects/object-user.png'); }
>+#details h1.usergroup { background-image: url('/ipa/ui/static/images/objects/object-usergroup.png'); }
> 
>-#details h1.content-overview { background-image: url('/static/images/objects/object-content.png'); }
>-#details h1.channel { background-image: url('/static/images/objects/object-channel.png'); }
>-#details h1.channel-new { background-image: url('/static/images/objects/object-channel.png'); }
>-#details h1.channels { background-image: url('/static/images/objects/object-channels.png'); }
>-#details h1.media { background-image: url('/static/images/objects/object-media.png'); }
>+#details h1.content-overview { background-image: url('/ipa/ui/static/images/objects/object-content.png'); }
>+#details h1.channel { background-image: url('/ipa/ui/static/images/objects/object-channel.png'); }
>+#details h1.channel-new { background-image: url('/ipa/ui/static/images/objects/object-channel.png'); }
>+#details h1.channels { background-image: url('/ipa/ui/static/images/objects/object-channels.png'); }
>+#details h1.media { background-image: url('/ipa/ui/static/images/objects/object-media.png'); }
> 
>-#details h1.system { background-image: url('/static/images/objects/object-system.png'); }
>-#details h1.virtualsystem { background-image: url('/static/images/objects/object-virtualsystem.png'); }
>+#details h1.system { background-image: url('/ipa/ui/static/images/objects/object-system.png'); }
>+#details h1.virtualsystem { background-image: url('/ipa/ui/static/images/objects/object-virtualsystem.png'); }
> 
>-#details h1.policy { background-image: url('/static/images/objects/object-policy.png'); }
>+#details h1.policy { background-image: url('/ipa/ui/static/images/objects/object-policy.png'); }
>diff -r b0c5924e1064 -r 291dd0914017 ipa-server/ipa-gui/ipagui/static/css/style_platform.css
>--- a/ipa-server/ipa-gui/ipagui/static/css/style_platform.css	Thu Apr 03 15:40:11 2008 -0400
>+++ b/ipa-server/ipa-gui/ipagui/static/css/style_platform.css	Thu Apr 03 15:45:44 2008 -0400
>@@ -12,7 +12,7 @@ html, body {
> }
> 
> body {
>-  background-image:		url('/static/images/template/background.png');
>+  background-image:		url('/ipa/ui/static/images/template/background.png');
>   background-repeat:		repeat-x;
>   background-color:		#f9f9f9;
>   margin:			0px;
>@@ -45,7 +45,7 @@ td, th {
>   float:			left;
>   margin-top:			-10px;
> 
>-  background:			url('/static/images/branding/logo.png') no-repeat;
>+  background:			url('/ipa/ui/static/images/branding/logo.png') no-repeat;
> }
> 
> #content {
>@@ -53,7 +53,7 @@ td, th {
>   min-height:			100%;
> 
>   background-color:		#f9f9f9;
>-  background-image:		url('/static/images/template/background-content.png');
>+  background-image:		url('/ipa/ui/static/images/template/background-content.png');
>   background-repeat:		repeat-x;
> }
> 
>@@ -95,7 +95,7 @@ div#search {
>   margin: 			0px;
>   clear:			both;
> 
>-  background-image:		url('/static/images/template/background-navbar.png');
>+  background-image:		url('/ipa/ui/static/images/template/background-navbar.png');
>   background-repeat:		repeat-x;
> 
> }
>@@ -121,7 +121,7 @@ div#search {
> }
> 
> #navbar .active {
>-  background-image:		url('/static/images/template/background-navbar-active.png');
>+  background-image:		url('/ipa/ui/static/images/template/background-navbar-active.png');
>   height:			70px;
>   width:			116px;
> 
>@@ -156,7 +156,7 @@ div#search {
> 
>   border:			1px solid #aaa;
>   background-color:		#ccc;
>-  background-image:		url('/static/images/template/background-sidebar.png');
>+  background-image:		url('/ipa/ui/static/images/template/background-sidebar.png');
>   background-repeat:		repeat-y;
> }
> 
>@@ -477,7 +477,7 @@ div.instructions {
>   padding-top: 2ex;
>   width: 40%;
>   float: right;
>-  background-image:     url('/static/images/template/background-search.png');
>+  background-image:     url('/ipa/ui/static/images/template/background-search.png');
>   background-repeat:        repeat-y;
>   background-color: white;
> } 
>diff -r b0c5924e1064 -r 291dd0914017 ipa-server/ipa-gui/ipagui/templates/master.kid
>--- a/ipa-server/ipa-gui/ipagui/templates/master.kid	Thu Apr 03 15:40:11 2008 -0400
>+++ b/ipa-server/ipa-gui/ipagui/templates/master.kid	Thu Apr 03 15:45:44 2008 -0400
>@@ -24,13 +24,13 @@
>     <title py:replace="''">Your title goes here</title>
>     <meta py:replace="item[:]"/>
>     <style type="text/css" media="all">
>-    @import "/static/css/style_platform.css";
>-    @import "/static/css/style_platform-objects.css";
>-    @import "/static/css/style_freeipa.css";
>+    @import "${tg.url('/static/css/style_platform.css')}";
>+    @import "${tg.url('/static/css/style_platform-objects.css')}";
>+    @import "${tg.url('/static/css/style_freeipa.css')}";
>     </style>
>-    <script type="text/javascript" charset="utf-8" src="/static/javascript/prototype.js"></script>
>-    <script type="text/javascript" charset="utf-8" src="/static/javascript/scriptaculous.js?load=effects"></script>
>-    <script type="text/javascript" charset="utf-8" src="/static/javascript/ipautil.js"></script>
>+    <script type="text/javascript" charset="utf-8" src="${tg.url('/static/javascript/prototype.js')}"></script>
>+    <script type="text/javascript" charset="utf-8" src="${tg.url('/static/javascript/scriptaculous.js?load=effects')}"></script>
>+    <script type="text/javascript" charset="utf-8" src="${tg.url('/static/javascript/ipautil.js')}"></script>
> </head>
> 
> <body py:match="item.tag=='{http://www.w3.org/1999/xhtml}body'" py:attrs="item.items()">
>diff -r b0c5924e1064 -r 291dd0914017 ipa-server/xmlrpc-server/ipa-rewrite.conf
>--- a/ipa-server/xmlrpc-server/ipa-rewrite.conf	Thu Apr 03 15:40:11 2008 -0400
>+++ b/ipa-server/xmlrpc-server/ipa-rewrite.conf	Thu Apr 03 15:45:44 2008 -0400
>@@ -3,7 +3,7 @@ RewriteEngine on
> # By default forward all requests to /ipa. If you don't want IPA
> # to be the default on your web server comment this line out. You will
> # need to modify ipa_webgui.cfg as well.
>-RewriteRule ^/$$ https://$FQDN/ipa [L,NC,R=301]
>+RewriteRule ^/$$ https://$FQDN/ipa/ui [L,NC,R=301]
> 
> # Redirect to the fully-qualified hostname. Not redirecting to secure
> # port so configuration files can be retrieved without requiring SSL.
>diff -r b0c5924e1064 -r 291dd0914017 ipa-server/xmlrpc-server/ipa.conf
>--- a/ipa-server/xmlrpc-server/ipa.conf	Thu Apr 03 15:40:11 2008 -0400
>+++ b/ipa-server/xmlrpc-server/ipa.conf	Thu Apr 03 15:45:44 2008 -0400
>@@ -17,7 +17,7 @@ AddType application/java-archive        
>   Krb5KeyTab /etc/httpd/conf/ipa.keytab
>   KrbSaveCredentials on
>   Require valid-user
>-  ErrorDocument 401 /errors/unauthorized.html
>+  ErrorDocument 401 /ipa/errors/unauthorized.html
>   RewriteEngine on
>   Order deny,allow
>   Allow from all
>@@ -28,20 +28,17 @@ AddType application/java-archive        
> </Proxy>
> 
> # The URI's with a trailing ! are those that aren't handled by the proxy
>-ProxyPass /ipa http://localhost:8080/ipa
>-ProxyPassReverse /ipa http://localhost:8080/ipa
>+ProxyPass /ipa/ui http://localhost:8080/ipa/ui
>+ProxyPassReverse /ipa/ui http://localhost:8080/ipa/ui
> 
> # Configure the XML-RPC service
>-Alias /ipaxml "/usr/share/ipa/ipaserver/XMLRPC"
>+Alias /ipa/xml "/usr/share/ipa/ipaserver/XMLRPC"
> 
> # This is where we redirect on failed auth
>-Alias /errors "/usr/share/ipa/html"
>+Alias /ipa/errors "/usr/share/ipa/html"
> 
> # For the MIT Windows config files
>-Alias /config "/usr/share/ipa/html"
>-
>-# So we don't have to hardcode a path into the CSS
>-Alias /static "/usr/share/ipa/ipagui/static"
>+Alias /ipa/config "/usr/share/ipa/html"
> 
> <Directory "/usr/share/ipa/ipaserver">
>   AuthType Kerberos
>@@ -53,7 +50,7 @@ Alias /static "/usr/share/ipa/ipagui/sta
>   Krb5KeyTab /etc/httpd/conf/ipa.keytab
>   KrbSaveCredentials on
>   Require valid-user
>-  ErrorDocument 401 /errors/unauthorized.html
>+  ErrorDocument 401 /ipa/errors/unauthorized.html
> 
>   SetHandler mod_python
>   PythonHandler ipaxmlrpc
>@@ -84,7 +81,7 @@ Alias /static "/usr/share/ipa/ipagui/sta
>   Krb5KeyTab /etc/httpd/conf/ipa.keytab
>   KrbSaveCredentials on
>   Require valid-user
>-  ErrorDocument 401 /errors/unauthorized.html
>+  ErrorDocument 401 /ipa/errors/unauthorized.html
> </Directory>
> 
> #Alias /ipatest "/usr/share/ipa/ipatest"
>@@ -99,7 +96,7 @@ Alias /static "/usr/share/ipa/ipagui/sta
> #  Krb5KeyTab /etc/httpd/conf/ipa.keytab
> #  KrbSaveCredentials on
> #  Require valid-user
>-#  ErrorDocument 401 /errors/unauthorized.html
>+#  ErrorDocument 401 /ipa/errors/unauthorized.html
> #
> #  SetHandler mod_python
> #  PythonHandler test_mod_python
>diff -r b0c5924e1064 -r 291dd0914017 ipa-server/xmlrpc-server/unauthorized.html
>--- a/ipa-server/xmlrpc-server/unauthorized.html	Thu Apr 03 15:40:11 2008 -0400
>+++ b/ipa-server/xmlrpc-server/unauthorized.html	Thu Apr 03 15:45:44 2008 -0400
>@@ -5,12 +5,12 @@
> <p>
> Unable to verify your Kerberos credentials. Please make sure
> that you have valid Kerberos tickets (obtainable via kinit), and that you
>-have <a href="/errors/ssbrowser.html">configured your
>+have <a href="/ipa/errors/ssbrowser.html">configured your
> browser correctly</a>. If you are still unable to access
> the IPA Web interface, please contact the helpdesk on for additional assistance.
> </p>
> <p>
>-Import the <a href="/errors/ca.crt">IPA Certificate Authority</a>.
>+Import the <a href="/ipa/errors/ca.crt">IPA Certificate Authority</a>.
> </p>
> <p>
> <script type="text/javascript">
>@@ -19,7 +19,7 @@ Import the <a href="/errors/ca.crt">IPA 
>   {
>     document.write("<p>You can automatically configure your browser to work with Kerberos by importing the Certificate Authority above and clicking on the Configure Browser button.</p>");
>     document.write("<p>You <strong>must</strong> reload this page after importing the Certificate Authority for the automatic settings to work</p>");
>-    document.write("<object data=\"jar:/errors/configure.jar!/preferences.html\" type=\"text/html\"><\/object");
>+    document.write("<object data=\"jar:/ipa/errors/configure.jar!/preferences.html\" type=\"text/html\"><\/object");
>   }
> </script>
> </p>

Actions: View | Diff

Attachments on bug 440443: 300310 | 304680 | 304769