projects
/
shibboleth
/
sp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove logo from defaults and templates
[shibboleth/sp.git]
/
configs
/
apache.config.in
diff --git
a/configs/apache.config.in
b/configs/apache.config.in
index
ba07a40
..
54d64b6
100644
(file)
--- a/
configs/apache.config.in
+++ b/
configs/apache.config.in
@@
-1,30
+1,26
@@
-#
ADD THIS TO THE END OF YOUR APACHE'S HTTPD.CONF
+#
https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
-#
#####
-#
# SHIB Config
-#
#####
+#
RPM installations on platforms with a conf.d directory will
+#
result in this file being copied into that directory for you
+#
and preserved across upgrades.
-#
-# Load the Shibboleth module.
-#
-LoadModule mod_shib @-LIBEXECDIR-@/mod_shib_13.so
+# For non-RPM installs, you should copy the relevant contents of
+# this file to a configuration location you control.
#
#
-# Global Configuration
-# This is the XML file that contains all the global, non-apache-specific
-# configuration. Look at this file for most of your configuration parameters.
+# Load the Shibboleth module.
#
#
-ShibSchemaDir @-PKGSYSCONFDIR-@
-ShibConfig @-PKGSYSCONFDIR-@/shibboleth.xml
+LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_13.so
#
#
-# A handler needs to be established for the SHIRE URL
-# This applies the handler to any documents with a "shire" extension
+# An Apache handler needs to be established for the "handler" location.
+# This applies the handler to any requests for a resource with a ".sso"
+# extension.
#
#
-<Files *.s
hire
>
-SetHandler shib-
shire-post
+<Files *.s
so
>
+SetHandler shib-
handler
</Files>
</Files>
-#
+
# Another way of addressing this is to apply Shibboleth
# globally to the site in "lazy" session mode:
# <Location />
# Another way of addressing this is to apply Shibboleth
# globally to the site in "lazy" session mode:
# <Location />
@@
-33,24
+29,22
@@
SetHandler shib-shire-post
# </Location>
#
# </Location>
#
-# Used for example
logo and
style sheet in error templates.
+# Used for example style sheet in error templates.
#
<IfModule mod_alias.c>
#
<IfModule mod_alias.c>
- Alias /shibtarget/main.css @-PREFIX-@/doc/shibboleth/main.css
- Alias /shibtarget/logo.jpg @-PREFIX-@/doc/shibboleth/logo.jpg
+ Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
</IfModule>
#
</IfModule>
#
-# Configure the module for content
+# Configure the module for content
.
#
#
-# You can now do most of this in shibboleth.xml using the RequestMap
-# but you MUST enable AuthType shibboleth for the module to process
+# You MUST enable AuthType shibboleth for the module to process
# any requests, and there MUST be a require command as well. To
# any requests, and there MUST be a require command as well. To
-# enable Shibboleth but not specify any session/access requirement
-# use "require
S
hibboleth".
+# enable Shibboleth but not specify any session/access requirement
s
+# use "require
s
hibboleth".
#
<Location /secure>
AuthType shibboleth
#
<Location /secure>
AuthType shibboleth
- ShibRequ
ireSession On
+ ShibRequ
estSetting requireSession 1
require valid-user
</Location>
require valid-user
</Location>