make HANDLER absolute path

diff --git a/modules/dacs/files/common/site.conf b/modules/dacs/files/common/site.conf
index 7fe48c762ac3064c52b4ab72a6cf3eb97a0042cf..e7a5c1abad317f0ae71b3e9a89a6d6d8f81fb9f8 100644 (file)
--- 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 205333c3a0c2779fd8655dbe82f7097d35fa8049..c5f46f2aa1872033f82487b4a116429436c5d9c0 100644 (file)
--- 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,
     }