From d1ce6384b67aa65e19eaaceed49a06599247c99b Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Mon, 18 Mar 2019 16:43:56 +0100 Subject: [PATCH] Fix default conf manager rule --- _example/conf/lmConf-1.json | 2 +- e2e-tests/lmConf-1.json | 2 +- lemonldap-ng-common/lemonldap-ng.ini | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/_example/conf/lmConf-1.json b/_example/conf/lmConf-1.json index f2df85ed5..35324aa79 100644 --- a/_example/conf/lmConf-1.json +++ b/_example/conf/lmConf-1.json @@ -125,7 +125,7 @@ "default" : "accept" }, "manager.__DNSDOMAIN__" : { - "(?#Configuration)^/(manager\\.html|conf/)" : "$uid eq \"dwho\"", + "(?#Configuration)^/(manager\\.html|$)" : "$uid eq \"dwho\"", "(?#Notifications)/notifications" : "$uid eq \"dwho\" or $uid eq \"rtyler\"", "(?#Sessions)/sessions" : "$uid eq \"dwho\" or $uid eq \"rtyler\"", "default" : "$uid eq \"dwho\" or $uid eq \"rtyler\"" diff --git a/e2e-tests/lmConf-1.json b/e2e-tests/lmConf-1.json index cd14a9f0c..552753117 100644 --- a/e2e-tests/lmConf-1.json +++ b/e2e-tests/lmConf-1.json @@ -147,7 +147,7 @@ "default" : "accept" }, "manager.example.com": { - "(?#Configuration)^/(manager\\.html|conf/)": "$uid eq \"dwho\"", + "(?#Configuration)^/(manager\\.html|$)": "$uid eq \"dwho\"", "(?#Notifications)^/notifications": "$uid eq \"dwho\" or $uid eq \"rtyler\"", "(?#Sessions)^/sessions": "$uid eq \"dwho\" or $uid eq \"rtyler\"", "default": "$uid eq \"dwho\" or $uid eq \"rtyler\"" diff --git a/lemonldap-ng-common/lemonldap-ng.ini b/lemonldap-ng-common/lemonldap-ng.ini index 9725d1d5c..f83d7f927 100644 --- a/lemonldap-ng-common/lemonldap-ng.ini +++ b/lemonldap-ng-common/lemonldap-ng.ini @@ -360,7 +360,11 @@ languages = fr, en, vi, ar ; Manager modules enabled ; Set here the list of modules you want to see in manager interface ; The first will be used as default module displayed -enabledModules = conf, sessions, notifications, 2ndFA +enabledModules = conf, sessions, notifications, 2ndFA, viewer + +; Viewer options - Default values +;viewerHiddenPK = samlIDPMetaDataNodes samlSPMetaDataNodes +;viewerAllowBrowser = 0 ;[node-handler] ;