From d4c5442e583c2155e1592a10bf8c5bddc4cb5544 Mon Sep 17 00:00:00 2001 From: "peng.jianhua" Date: Wed, 24 Jan 2018 13:37:52 +0800 Subject: [PATCH 1/1] KYLIN-3191 --- core-common/src/main/resources/kylin-backward-compatibility.properties | 1 - core-common/src/main/resources/kylin-defaults.properties | 3 +-- examples/test_case_data/localmeta/kylin.properties | 3 +-- examples/test_case_data/sandbox/kylin.properties | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core-common/src/main/resources/kylin-backward-compatibility.properties b/core-common/src/main/resources/kylin-backward-compatibility.properties index 687c6a08f..05f5b1158 100644 --- a/core-common/src/main/resources/kylin-backward-compatibility.properties +++ b/core-common/src/main/resources/kylin-backward-compatibility.properties @@ -195,7 +195,6 @@ kylin.query.metrics.percentiles.intervals=kylin.server.query-metrics-percentiles ### SECURITY ### kylin.security.profile=kylin.security.profile -acl.defaultRole=kylin.security.acl.default-role acl.adminRole=kylin.security.acl.admin-role ldap.server=kylin.security.ldap.connection-server ldap.username=kylin.security.ldap.connection-username diff --git a/core-common/src/main/resources/kylin-defaults.properties b/core-common/src/main/resources/kylin-defaults.properties index e87b31dcb..edc3955af 100644 --- a/core-common/src/main/resources/kylin-defaults.properties +++ b/core-common/src/main/resources/kylin-defaults.properties @@ -242,8 +242,7 @@ kylin.query.transformers=org.apache.kylin.query.util.DefaultQueryTransformer,org # with "testing" profile, user can use pre-defined name/pwd like KYLIN/ADMIN to login kylin.security.profile=testing -# Default roles and admin roles in LDAP, for ldap and saml -kylin.security.acl.default-role=ROLE_ANALYST,ROLE_MODELER +# Admin roles in LDAP, for ldap and saml kylin.security.acl.admin-role=ROLE_ADMIN # LDAP authentication configuration diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties index 962f91678..1e3f2ff72 100644 --- a/examples/test_case_data/localmeta/kylin.properties +++ b/examples/test_case_data/localmeta/kylin.properties @@ -92,8 +92,7 @@ kylin.query.transformers=org.apache.kylin.query.util.DefaultQueryTransformer,org # with "testing" profile, user can use pre-defined name/pwd like KYLIN/ADMIN to login kylin.security.profile=testing -# Default roles and admin roles in LDAP, for ldap and saml -kylin.security.acl.default-role=ROLE_ANALYST,ROLE_MODELER +# Admin roles in LDAP, for ldap and saml kylin.security.acl.admin-role=ROLE_ADMIN # LDAP authentication configuration diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties index 13d62a2ea..c966999d3 100644 --- a/examples/test_case_data/sandbox/kylin.properties +++ b/examples/test_case_data/sandbox/kylin.properties @@ -140,8 +140,7 @@ kylin.query.security-enabled=true # with "testing" profile, user can use pre-defined name/pwd like KYLIN/ADMIN to login kylin.security.profile=testing -# Default roles and admin roles in LDAP, for ldap and saml -kylin.security.acl.default-role=ROLE_ANALYST,ROLE_MODELER +# Admin roles in LDAP, for ldap and saml kylin.security.acl.admin-role=ROLE_ADMIN -- 2.11.0.windows.1