52 lines
2.2 KiB
Diff
52 lines
2.2 KiB
Diff
--- a/install/share/ipa.conf.template
|
|
+++ b/install/share/ipa.conf.template
|
|
@@ -183,7 +183,7 @@ Alias /ipa/crl "$CRL_PUBLISH_PATH"
|
|
|
|
# List explicitly only the fonts we want to serve
|
|
Alias /ipa/ui/fonts/open-sans "${FONTS_DIR}/open-sans"
|
|
-Alias /ipa/ui/fonts/fontawesome "${FONTS_DIR}/fontawesome"
|
|
+Alias /ipa/ui/fonts/fontawesome "${FONTS_DIR}/${FONT_AWESOME_DIR}"
|
|
<Directory "${FONTS_DIR}">
|
|
SetHandler None
|
|
AllowOverride None
|
|
--- a/ipaplatform/base/paths.py
|
|
+++ b/ipaplatform/base/paths.py
|
|
@@ -245,6 +245,7 @@ class BasePathNamespace(object):
|
|
SMBD = "/usr/sbin/smbd"
|
|
USERADD = "/usr/sbin/useradd"
|
|
FONTS_DIR = "/usr/share/fonts"
|
|
+ FONT_AWESOME_DIR = "fontawesome"
|
|
USR_SHARE_IPA_DIR = "/usr/share/ipa/"
|
|
USR_SHARE_IPA_CLIENT_DIR = "/usr/share/ipa/client"
|
|
CA_TOPOLOGY_ULDIF = "/usr/share/ipa/ca-topology.uldif"
|
|
--- a/ipaplatform/debian/paths.py
|
|
+++ b/ipaplatform/debian/paths.py
|
|
@@ -87,6 +87,7 @@ class DebianPathNamespace(BasePathNamesp
|
|
REMOVE_DS_PL = "/usr/sbin/remove-ds"
|
|
SETUP_DS_PL = "/usr/sbin/setup-ds"
|
|
FONTS_DIR = "/usr/share/fonts/truetype"
|
|
+ FONT_AWESOME_DIR = "font-awesome"
|
|
VAR_KERBEROS_KRB5KDC_DIR = "/var/lib/krb5kdc/"
|
|
VAR_KRB5KDC_K5_REALM = "/var/lib/krb5kdc/.k5."
|
|
CACERT_PEM = "/var/lib/krb5kdc/cacert.pem"
|
|
--- a/ipaserver/install/httpinstance.py
|
|
+++ b/ipaserver/install/httpinstance.py
|
|
@@ -104,6 +104,7 @@ class HTTPInstance(service.Service):
|
|
AUTOREDIR='' if auto_redirect else '#',
|
|
CRL_PUBLISH_PATH=paths.PKI_CA_PUBLISH_DIR,
|
|
FONTS_DIR=paths.FONTS_DIR,
|
|
+ FONT_AWESOME_DIR=paths.FONT_AWESOME_DIR,
|
|
GSSAPI_SESSION_KEY=paths.GSSAPI_SESSION_KEY,
|
|
IPA_CUSTODIA_SOCKET=paths.IPA_CUSTODIA_SOCKET,
|
|
IPA_CCACHES=paths.IPA_CCACHES,
|
|
--- a/ipaserver/install/server/upgrade.py
|
|
+++ b/ipaserver/install/server/upgrade.py
|
|
@@ -1789,6 +1789,7 @@ def upgrade_configuration():
|
|
WSGI_PROCESSES=constants.WSGI_PROCESSES,
|
|
GSSAPI_SESSION_KEY=paths.GSSAPI_SESSION_KEY,
|
|
FONTS_DIR=paths.FONTS_DIR,
|
|
+ FONT_AWESOME_DIR=paths.FONT_AWESOME_DIR,
|
|
IPA_CCACHES=paths.IPA_CCACHES,
|
|
IPA_CUSTODIA_SOCKET=paths.IPA_CUSTODIA_SOCKET,
|
|
KDCPROXY_CONFIG=paths.KDCPROXY_CONFIG,
|