Commit 3db9bec5 authored by Xavier Guimard's avatar Xavier Guimard

Move UA to macro (partial revert r6447) [#1044]

parent 28994697
......@@ -102,9 +102,7 @@
"Auth-User" : "$uid"
}
},
"exportedVars" : {
"UA" : "HTTP_USER_AGENT"
},
"exportedVars" : {},
"globalStorage" : "Apache::Session::File",
"globalStorageOptions" : {
"Directory" : "__SESSIONDIR__",
......@@ -138,6 +136,7 @@
},
"loginHistoryEnabled" : 1,
"macros" : {
"UA" : "HTTP_USER_AGENT",
"_whatToTrace" : "$_auth eq 'SAML' ? \"$_user\\@$_idpConfKey\" : $_auth eq 'OpenIDConnect' ? \"$_user\\@$_oidcConnectedRP\" : \"$_user\""
},
"mailUrl" : "http://auth.__DNSDOMAIN__/resetpwd",
......
......@@ -17,4 +17,4 @@ describe('Lemonldap::NG Manager', function() {
expect(skinChoice.count()).toEqual(1);
});
});
});
});
\ No newline at end of file
......@@ -17,4 +17,4 @@ describe('Lemonldap::NG Manager', function() {
});
});
});
});
\ No newline at end of file
......@@ -50,4 +50,4 @@ describe('Lemonldap::NG Session explorer', function() {
expect(t.count()).toBeGreaterThan(0);
});
});
});
\ No newline at end of file
......@@ -108,7 +108,8 @@ sub zeroConf {
},
'macros' => {
'_whatToTrace' =>
'$_auth eq \'SAML\' ? "$_user\\@$_idpConfKey" : $_auth eq \'OpenIDConnect\' ? "$_user\\@$_oidcConnectedRP" : "$_user"'
'$_auth eq \'SAML\' ? "$_user\\@$_idpConfKey" : $_auth eq \'OpenIDConnect\' ? "$_user\\@$_oidcConnectedRP" : "$_user"',
'UA' => 'HTTP_USER_AGENT'
},
'notificationStorageOptions' => {
'dirName' => $notificationDir
......@@ -167,10 +168,8 @@ sub zeroConf {
'cookieName' => 'lemonldap',
'cfgAuthor' => 'The LemonLDAP::NG team',
'cfgVersion' => $VERSION,
'exportedVars' => {
'UA' => 'HTTP_USER_AGENT'
},
'portalSkin' => 'bootstrap',
'exportedVars' => {},
'portalSkin' => 'bootstrap',
'portalSkinBackground' =>
'1280px-Cedar_Breaks_National_Monument_partially.jpg',
'mailUrl' => "http://auth.$domain/resetpwd",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment