From 69620bed780dea094b6064d4151fb07b33151265 Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Tue, 27 Oct 2020 19:11:38 +0100
Subject: [PATCH] fix apache config syntax
---
shibauth/etc-httpd/conf.d/shib.conf | 2 +-
shibauth/etc-httpd/conf.d/sp.conf | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/shibauth/etc-httpd/conf.d/shib.conf b/shibauth/etc-httpd/conf.d/shib.conf
index 635aa462..cb82c34e 100755
--- a/shibauth/etc-httpd/conf.d/shib.conf
+++ b/shibauth/etc-httpd/conf.d/shib.conf
@@ -1,7 +1,7 @@
-ServerName emg.pdas.prism.eox.at
LoadModule mod_shib /usr/lib64/shibboleth/mod_shib_24.so
ShibCompatValidUser Off
UseCanonicalName On
+DocumentRoot "/var/www/html"
<Location />
SetHandler shib
</Location>
diff --git a/shibauth/etc-httpd/conf.d/sp.conf b/shibauth/etc-httpd/conf.d/sp.conf
index ad617192..5186e84f 100755
--- a/shibauth/etc-httpd/conf.d/sp.conf
+++ b/shibauth/etc-httpd/conf.d/sp.conf
@@ -1,12 +1,10 @@
<VirtualHost *:80>
- ServerName PassEnv APACHE_SERVERNAME
- UseCanonicalName On
-
- DocumentRoot "/var/www/html"
+ PassEnv APACHE_SERVERNAME
+ ServerName "${APACHE_SERVERNAME}"
<Location /secure>
AuthType shibboleth
ShibRequestSetting requireSession 1
- ShibAccessControl /etc/shibboleth/pass-ac.xml
+ Require shib-plugin /etc/shibboleth/pass-ac.xml
RequestHeader set Referer "%{X-Forwarded-Uri}e"
Header set Referer "%{X-Forwarded-Uri}e"
</Location>
--
GitLab