From 5186d667a6d8839c92706f37e2f4077b806280bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1sztor=20J=C3=A1nos?= <janos.pasztor@balabit.com>
Date: Mon, 27 Jun 2016 10:14:42 +0200
Subject: [PATCH] Combine Apache 2.2 and 2.4 to one configuration
---
docs/simplesamlphp-install.md | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/docs/simplesamlphp-install.md b/docs/simplesamlphp-install.md
index 118c4f7e0..254ab66d8 100644
--- a/docs/simplesamlphp-install.md
+++ b/docs/simplesamlphp-install.md
@@ -119,13 +119,19 @@ Find the Apache configuration file for the virtual hosts where you want to run S
SetEnv SIMPLESAMLPHP_CONFIG_DIR /var/simplesamlphp/config
Alias /simplesaml /var/simplesamlphp/www
- </VirtualHost>
-
-If you are using Apache 2.4.6 or higher version, you have to add an extra configuration directive to play nicely with the Apache 2.4 security settings
- <Directory /var/simplesamlphp/www/>
- Require all granted
- </Directory>
+ <Directory /var/simplesamlphp/www>
+ <IfModule !mod_authz_core.c>
+ # For Apache 2.2:
+ Order allow,deny
+ Allow from all
+ </IfModule>
+ <IfModule mod_authz_core.c>
+ # For Apache 2.4:
+ Require all granted
+ </IfModule>
+ </Directory>
+ </VirtualHost>
Note the `Alias` directive, which gives control to SimpleSAMLphp for all urls matching `http(s)://service.example.com/simplesaml/*`. SimpleSAMLphp makes several SAML interfaces available on the web; all of them are included in the `www` subdirectory of your SimpleSAMLphp installation. You can name the alias whatever you want, but the name must be specified in the `config.php` file of simpleSAML as described in [the section called “SimpleSAMLphp configuration: config.php”](#sect.config "SimpleSAMLphp configuration: config.php"). Here is an example of how this configuration may look like in `config.php`:
--
GitLab