diff options
| author | Adam Young <ayoung@redhat.com> | 2010-08-03 19:42:03 -0400 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2010-08-06 11:55:52 -0400 |
| commit | b7162b3b8aadb6b5672dab33c2771fd266286076 (patch) | |
| tree | 03e2d55a65211774461176064e21d854f27517a7 | |
| parent | 125bd09faf21411fafda01e76989b4856bbd267c (diff) | |
| download | freeipa-b7162b3b8aadb6b5672dab33c2771fd266286076.tar.gz freeipa-b7162b3b8aadb6b5672dab33c2771fd266286076.tar.xz freeipa-b7162b3b8aadb6b5672dab33c2771fd266286076.zip | |
Changes to the install and config files to support deploying the javascript code.
| -rw-r--r-- | install/Makefile.am | 1 | ||||
| -rw-r--r-- | install/conf/ipa.conf | 15 | ||||
| -rw-r--r-- | install/configure.ac | 1 | ||||
| -rw-r--r-- | ipa.spec.in | 6 |
4 files changed, 23 insertions, 0 deletions
diff --git a/install/Makefile.am b/install/Makefile.am index 1b97afa5b..80f04bd74 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 dba47c5a4..85b37b834 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 eb2d3cd13..3d0c1db02 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 0ccf7018f..885056bc0 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 |