From d3564a80d2450429de7a6d5cca569cbcb1db7af9 Mon Sep 17 00:00:00 2001 From: cantor Date: Wed, 3 Oct 2007 16:31:41 +0000 Subject: [PATCH] Linefeed change git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2526 cb58f699-b61c-0410-a6fe-9272a202ed29 --- configs/console.logger | 18 ++--- configs/globalLogout.html | 82 +++++++++++----------- configs/localLogout.html | 48 ++++++------- configs/shibd-debian.in | 168 +++++++++++++++++++++++----------------------- 4 files changed, 158 insertions(+), 158 deletions(-) diff --git a/configs/console.logger b/configs/console.logger index c3d264a..659f5bb 100644 --- a/configs/console.logger +++ b/configs/console.logger @@ -1,9 +1,9 @@ -log4j.rootCategory=WARN, console - -# fairly verbose for DEBUG, so generally leave at INFO -log4j.category.XMLTooling.XMLObject=INFO - -log4j.appender.console=org.apache.log4j.ConsoleAppender -#log4j.appender.console.layout=org.apache.log4j.BasicLayout -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n +log4j.rootCategory=WARN, console + +# fairly verbose for DEBUG, so generally leave at INFO +log4j.category.XMLTooling.XMLObject=INFO + +log4j.appender.console=org.apache.log4j.ConsoleAppender +#log4j.appender.console.layout=org.apache.log4j.BasicLayout +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n diff --git a/configs/globalLogout.html b/configs/globalLogout.html index 9af17f2..8306e50 100644 --- a/configs/globalLogout.html +++ b/configs/globalLogout.html @@ -1,41 +1,41 @@ - - - - - - - - Global Logout - - - -

Global Logout

- -

Status of Global Logout:

- - -

Error from your identity provider:

- Status:
- - Sub-Status:
- - - Message:
- -

- - -

If the message above indicates success, you have been logged out of all -the applications and systems that support the logout mechanism.

- -

It is still strongly advised that you close your browser to complete the -logout process.

- - - + + + + + + + + Global Logout + + + +

Global Logout

+ +

Status of Global Logout:

+ + +

Error from your identity provider:

+ Status:
+ + Sub-Status:
+ + + Message:
+ +

+ + +

If the message above indicates success, you have been logged out of all +the applications and systems that support the logout mechanism.

+ +

It is still strongly advised that you close your browser to complete the +logout process.

+ + + diff --git a/configs/localLogout.html b/configs/localLogout.html index b509647..f6439d6 100644 --- a/configs/localLogout.html +++ b/configs/localLogout.html @@ -1,24 +1,24 @@ - - - - - - - - Local Logout - - - -

Local Logout

- -Status of Local Logout: - -You MUST close your browser to complete the logout process. - - - + + + + + + + + Local Logout + + + +

Local Logout

+ +Status of Local Logout: + +You MUST close your browser to complete the logout process. + + + diff --git a/configs/shibd-debian.in b/configs/shibd-debian.in index a49f301..99ff4d1 100644 --- a/configs/shibd-debian.in +++ b/configs/shibd-debian.in @@ -1,84 +1,84 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: shibd -# Required-Start: $local_fs $remote_fs $network -# Required-Stop: $local_fs $remote_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: S 0 1 6 -# Short-Description: Shibboleth 2 Service Provider Daemon -# Description: Starts the separate daemon used by the Shibboleth -# Apache module to manage sessions and to retrieve -# attributes from Shibboleth Identity Providers. -### END INIT INFO -# -# Written by Quanah Gibson-Mount -# Modified by Lukas Haemmerle for Shibboleth 2 -# Based on the dh-make template written by: -# -# Written by Miquel van Smoorenburg . -# Modified for Debian -# by Ian Murdock . - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DESC="Shibboleth 2 daemon" -NAME=shibd -SHIB_HOME=@-PREFIX-@ -SHIBSP_CONFIG=@-PKGSYSCONFDIR-@/shibboleth2.xml -LD_LIBRARY_PATH=@-PREFIX-@/lib -DAEMON=@-PREFIX-@/sbin/$NAME -SCRIPTNAME=/etc/init.d/$NAME -PIDFILE=@-PKGRUNDIR-@/$NAME.pid -DAEMON_OPTS="" - -# Force removal of socket -DAEMON_OPTS="$DAEMON_OPTS -f" - -# Use defined configuration file -DAEMON_OPTS="$DAEMON_OPTS -c $SHIBSP_CONFIG" - -# Specify pid file to use -DAEMON_OPTS="$DAEMON_OPTS -p $PIDFILE" - -# Exit if the package is not installed. -[ -x "$DAEMON" ] || exit 0 - -# Read configuration if it is present. -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Get the setting of VERBOSE and other rcS variables. -[ -f /etc/default/rcS ] && . /etc/default/rcS - -case "$1" in -start) - # Don't start shibd if NO_START is set. - if [ "$NO_START" = 1 ] ; then - echo "Not starting $DESC (see /etc/default/$NAME)" - exit 0 - fi - echo -n "Starting $DESC: " - start-stop-daemon --background --start --quiet \ - --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." - ;; -stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - --exec $DAEMON - echo "$NAME." - ;; -restart|force-reload) - echo -n "Restarting $DESC: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - --exec $DAEMON - sleep 1 - start-stop-daemon --background --start --quiet \ - --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." - ;; -*) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 +#! /bin/sh +### BEGIN INIT INFO +# Provides: shibd +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: S 0 1 6 +# Short-Description: Shibboleth 2 Service Provider Daemon +# Description: Starts the separate daemon used by the Shibboleth +# Apache module to manage sessions and to retrieve +# attributes from Shibboleth Identity Providers. +### END INIT INFO +# +# Written by Quanah Gibson-Mount +# Modified by Lukas Haemmerle for Shibboleth 2 +# Based on the dh-make template written by: +# +# Written by Miquel van Smoorenburg . +# Modified for Debian +# by Ian Murdock . + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DESC="Shibboleth 2 daemon" +NAME=shibd +SHIB_HOME=@-PREFIX-@ +SHIBSP_CONFIG=@-PKGSYSCONFDIR-@/shibboleth2.xml +LD_LIBRARY_PATH=@-PREFIX-@/lib +DAEMON=@-PREFIX-@/sbin/$NAME +SCRIPTNAME=/etc/init.d/$NAME +PIDFILE=@-PKGRUNDIR-@/$NAME.pid +DAEMON_OPTS="" + +# Force removal of socket +DAEMON_OPTS="$DAEMON_OPTS -f" + +# Use defined configuration file +DAEMON_OPTS="$DAEMON_OPTS -c $SHIBSP_CONFIG" + +# Specify pid file to use +DAEMON_OPTS="$DAEMON_OPTS -p $PIDFILE" + +# Exit if the package is not installed. +[ -x "$DAEMON" ] || exit 0 + +# Read configuration if it is present. +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Get the setting of VERBOSE and other rcS variables. +[ -f /etc/default/rcS ] && . /etc/default/rcS + +case "$1" in +start) + # Don't start shibd if NO_START is set. + if [ "$NO_START" = 1 ] ; then + echo "Not starting $DESC (see /etc/default/$NAME)" + exit 0 + fi + echo -n "Starting $DESC: " + start-stop-daemon --background --start --quiet \ + --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; +stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --exec $DAEMON + echo "$NAME." + ;; +restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --exec $DAEMON + sleep 1 + start-stop-daemon --background --start --quiet \ + --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; +*) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 -- 2.1.4