From 2c1dd528dcfc1f07294492c6a17db011e2b6b055 Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Sun, 19 Feb 2012 14:10:01 +0100 Subject: [PATCH] make HANDLER absolute path --- modules/dacs/files/common/site.conf | 8 ++++---- modules/dacs/manifests/init.pp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/dacs/files/common/site.conf b/modules/dacs/files/common/site.conf index 7fe48c76..e7a5c1ab 100644 --- a/modules/dacs/files/common/site.conf +++ b/modules/dacs/files/common/site.conf @@ -74,7 +74,7 @@ AUTH_CREDENTIALS_DEFAULT_LIFETIME_SECS "43200" # DocumentRoot), not full file pathnames. For the default configuration to # work properly, they require an Apache Alias directive to be configured to map # "/handlers" to "${Conf::DACS_HOME}/www/handlers". -ACS_ERROR_HANDLER "* /handlers/acs_failed.html" +ACS_ERROR_HANDLER "* https://${Conf::JURISDICTION_AUTHSERVER}/public/index.cgi" # Default authentication and signout handlers # Since these are relative URLs, the Alias directive must be used as @@ -82,9 +82,9 @@ ACS_ERROR_HANDLER "* /handlers/acs_failed.html" # Note that the syntaxes of these directives are different from that of # ACS_ERROR_HANDLER. #AUTH_SUCCESS_HANDLER "url /handlers/auth_ok.html" -AUTH_SUCCESS_HANDLER "url /public/index.cgi" -AUTH_ERROR_HANDLER "* url /public/error.html" -SIGNOUT_HANDLER "url /public/index.cgi" +AUTH_SUCCESS_HANDLER "https://${Conf::JURISDICTION_AUTHSERVER}/public/index.cgi" +AUTH_ERROR_HANDLER "* https://${Conf::JURISDICTION_AUTHSERVER}/public/error.html" +SIGNOUT_HANDLER "https://${Conf::JURISDICTION_AUTHSERVER}/public/index.cgi" # These handlers can only be URLs (absolute or relative) NOTICES_ACCEPT_HANDLER "/handlers/notices_accepted.html" diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp index 205333c3..c5f46f2a 100644 --- a/modules/dacs/manifests/init.pp +++ b/modules/dacs/manifests/init.pp @@ -121,7 +121,7 @@ class dacs { exec { "dacsacl": - command => "dacsacl -uj DEBIAN", + command => "dacsacl -sc /etc/dacs/federations/site.conf -c /etc/dacs/federations/debian.org/DEBIAN/dacs.conf -uj DEBIAN && chown root:www-data /etc/dacs/federations/debian.org/DEBIAN/acls/INDEX" refreshonly => true, } -- 2.39.2