This patch is one of a series that are the web UI code broken out into 4 separate patches. This one contains the changes to the files used for the build and configure infrastructure code to support the new web ui.
>From 07973bae42ac7506952957a45e3d7e2e4e1d2779 Mon Sep 17 00:00:00 2001
From: Adam Young <ayo...@redhat.com>
Date: Tue, 3 Aug 2010 19:42:03 -0400
Subject: [PATCH 3/4] Changes to the install and config files to support 
deploying the javascript code.

---
 install/Makefile.am   |    1 +
 install/conf/ipa.conf |   15 +++++++++++++++
 install/configure.ac  |    1 +
 ipa.spec.in           |    6 ++++++
 4 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/install/Makefile.am b/install/Makefile.am
index 1b97afa..80f04bd 100644
--- a/install/Makefile.am
+++ b/install/Makefile.am
@@ -9,6 +9,7 @@ SUBDIRS =                       \
         html                   \
         migration              \
         share                  \
+        static                 \
         tools                  \
         updates                        \
         po                     \
diff --git a/install/conf/ipa.conf b/install/conf/ipa.conf
index dba47c5..85b37b8 100644
--- a/install/conf/ipa.conf
+++ b/install/conf/ipa.conf
@@ -5,6 +5,12 @@
 
 ProxyRequests Off
 
+
+#We use xhtml, a file format that the browser validates
+DirectoryIndex index.xhtml
+
+
+
 # ipa-rewrite.conf is loaded separately
 
 # This is required so the auto-configuration works with Firefox 2+
@@ -78,6 +84,15 @@ Alias /ipa/crl "/var/lib/pki-ca/publish"
 </Directory>
 
 
+# Static data files (maily webUI stuff like images)
+Alias /ipa/static "/usr/share/ipa/static"
+<Directory "/usr/share/ipa/static">
+  SetHandler None
+  AllowOverride None
+  Allow from all
+</Directory>
+
+
 # WebUI assets
 Alias /ipa-assets/ "/var/cache/ipa/assets/"
 <Directory "/var/cache/ipa/assets">
diff --git a/install/configure.ac b/install/configure.ac
index eb2d3cd..3d0c1db 100644
--- a/install/configure.ac
+++ b/install/configure.ac
@@ -72,6 +72,7 @@ AC_CONFIG_FILES([
     html/Makefile
     migration/Makefile
     share/Makefile
+    static/Makefile
     tools/Makefile
     tools/man/Makefile
     updates/Makefile
diff --git a/ipa.spec.in b/ipa.spec.in
index 0ccf701..885056b 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -391,6 +391,12 @@ fi
 %{_usr}/share/ipa/migration/invalid.html
 %{_usr}/share/ipa/migration/migration.css
 %{_usr}/share/ipa/migration/migration.py*
+%dir %{_usr}/share/ipa/static
+%{_usr}/share/ipa/static/*.png
+%{_usr}/share/ipa/static/*.css
+%{_usr}/share/ipa/static/*.js
+%dir %{_usr}/share/ipa/static
+%{_usr}/share/ipa/static/*
 %dir %{_sysconfdir}/ipa
 %dir %{_sysconfdir}/ipa/html
 %config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
-- 
1.7.1

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to