diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2013-12-04 16:15:20 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-01-21 12:05:09 +0100 |
| commit | 3e0ae972685aefa20ec619b17a7c2b7f7c2f50d9 (patch) | |
| tree | 7c7c4ba1a85d996e73c4320169ddc47c257b1e01 /install/conf | |
| parent | 6b71d1a16754f3bebe320bcb90f975d7e0225f64 (diff) | |
| download | freeipa-3e0ae972685aefa20ec619b17a7c2b7f7c2f50d9.tar.gz freeipa-3e0ae972685aefa20ec619b17a7c2b7f7c2f50d9.tar.xz freeipa-3e0ae972685aefa20ec619b17a7c2b7f7c2f50d9.zip | |
Use only system fonts
This commit changes how fonts are used.
- remove usage of bundled fonts and only system fonts are used instead
- by using alias in httpd conf
- by using local("Font Name") directive in font-face
- removed usage of overpass font
- redefined Open Sans font-face declarations. Note: upstream is doing the
same change so we will be fine on upgrade.
- introduce variable.less for variable definitions and overrides. This file
will be very useful when we upgrade to newer RCUE so we will be able to
redefine their and bootstrap's variables.
Fixes: https://fedorahosted.org/freeipa/ticket/2861
Diffstat (limited to 'install/conf')
| -rw-r--r-- | install/conf/ipa.conf | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/install/conf/ipa.conf b/install/conf/ipa.conf index f185f5146..f4dac9827 100644 --- a/install/conf/ipa.conf +++ b/install/conf/ipa.conf @@ -1,5 +1,5 @@ # -# VERSION 14 - DO NOT REMOVE THIS LINE +# VERSION 15 - DO NOT REMOVE THIS LINE # # This file may be overwritten on upgrades. # @@ -22,12 +22,13 @@ LimitRequestFieldSize 100000 AddType application/java-archive jar AddType application/x-xpinstall xpi -# Proper header for .woff fonts -AddType application/x-font-woff woff +# Proper header for .tff fonts +AddType application/x-font-ttf ttf # Enable compression AddOutputFilterByType DEFLATE text/html text/plain text/xml \ - application/javascript application/json text/css + application/javascript application/json text/css \ + application/x-font-ttf # Disable etag http header. Doesn't work well with mod_deflate # https://issues.apache.org/bugzilla/show_bug.cgi?id=45023 @@ -130,6 +131,19 @@ Alias /ipa/crl "$CRL_PUBLISH_PATH" </Directory> +# List explicitly only the fonts we want to serve +Alias /ipa/ui/fonts/open-sans "/usr/share/fonts/open-sans" +Alias /ipa/ui/fonts/fontawesome "/usr/share/fonts/fontawesome" +<Directory "/usr/share/fonts"> + SetHandler None + AllowOverride None + Satisfy Any + Allow from all + ExpiresActive On + ExpiresDefault "access plus 1 year" +</Directory> + + # webUI is now completely static, and served out of that directory Alias /ipa/ui "/usr/share/ipa/ui" <Directory "/usr/share/ipa/ui"> |