Fix configuration of error documents in httpd template

zstyblik · Aug 4, 2024 · aaac3be · aaac3be
1 parent 23e8812
commit aaac3be
Showing 1 changed file with 42 additions and 34 deletions.
diff --git a/templates/httpd.conf.j2 b/templates/httpd.conf.j2
@@ -183,38 +183,46 @@ LDAPTrustedMode {{ apache_httpd_ldap_trusted_mode }}
 {% endif %}
 
 {% if apache_httpd_error_documents_path %}
-Alias /error/ "{{ apache_httpd_error_documents_path }}/"
-
-<Directory "{{ apache_httpd_error_documents_path }}">
-  AllowOverride None
-  Options IncludesNoExec
-  AddOutputFilter Includes html
-  AddHandler type-map var
-{% if apache_version.startswith('2.4') %}
-  Require all granted
-{% else %}
-  Order allow,deny
-  Allow from all
-{% endif %}
-  LanguagePriority en cs de es fr it nl sv pt-br ro
-  ForceLanguagePriority Prefer Fallback
-</Directory>
-
-ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
-ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
-ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
-ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
-ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
-ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
-ErrorDocument 410 /error/HTTP_GONE.html.var
-ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
-ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
-ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
-ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
-ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
-ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
-ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+# The internationalized error documents require mod_alias, mod_include
+# and mod_negotiation.
+<IfModule mod_negotiation.c>
+  <IfModule mod_include.c>
+    <IfModule mod_alias.c>
+
+      Alias /error/ "/usr/share/apache2/error/"
+
+      <Directory "/usr/share/apache2/error">
+        Options IncludesNoExec
+        AddOutputFilter Includes html
+        AddHandler type-map var
+        {% if apache_version.startswith('2.4') %}
+        Require all granted
+        {% else %}
+        Order allow,deny
+        Allow from all
+        {% endif %}
+        LanguagePriority en cs de es fr it nl sv pt-br ro
+        ForceLanguagePriority Prefer Fallback
+      </Directory>
+
+      ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
+      ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
+      ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
+      ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
+      ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+      ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
+      ErrorDocument 410 /error/HTTP_GONE.html.var
+      ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
+      ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
+      ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+      ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+      ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+      ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
+      ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
+      ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
+      ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+      ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+    </IfModule>
+  </IfModule>
+</IfModule>
 {% endif %}