KYLIN-1962: move kylin.security.profile back to kylin.properties Signed-off-by: Hongbin Ma <mahong...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/322b4408 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/322b4408 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/322b4408 Branch: refs/heads/master Commit: 322b44085372ed188f2c92f1c1a7675c126510bb Parents: 69aaae2 Author: Yiming Liu <liuyiming....@gmail.com> Authored: Wed Aug 17 18:27:46 2016 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Wed Aug 17 18:32:39 2016 +0800 ---------------------------------------------------------------------- build/conf/kylin.properties | 11 +++++++++++ build/conf/kylin_account.properties | 8 -------- examples/test_case_data/localmeta/kylin.properties | 2 ++ .../test_case_data/localmeta/kylin_account.properties | 8 -------- examples/test_case_data/sandbox/kylin.properties | 10 ---------- .../test_case_data/sandbox/kylin_account.properties | 13 +++++++++++++ 6 files changed, 26 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/322b4408/build/conf/kylin.properties ---------------------------------------------------------------------- diff --git a/build/conf/kylin.properties b/build/conf/kylin.properties index 9cc0ec1..5607336 100644 --- a/build/conf/kylin.properties +++ b/build/conf/kylin.properties @@ -140,6 +140,17 @@ kylin.query.security.enabled=true kylin.query.cache.enabled=true +### SECURITY ### + +# Spring security profile, options: testing, ldap, saml +# with "testing" profile, user can use pre-defined name/pwd like KYLIN/ADMIN to login +kylin.security.profile=testing + +### MAIL ### + +# If true, will send email notification; +mail.enabled=false + ### WEB ### # Help info, format{name|displayName|link}, optional http://git-wip-us.apache.org/repos/asf/kylin/blob/322b4408/build/conf/kylin_account.properties ---------------------------------------------------------------------- diff --git a/build/conf/kylin_account.properties b/build/conf/kylin_account.properties index 39efd89..e98c142 100644 --- a/build/conf/kylin_account.properties +++ b/build/conf/kylin_account.properties @@ -7,11 +7,6 @@ kylin.job.remote.cli.username= kylin.job.remote.cli.password= ### SECURITY ### - -# Spring security profile, options: testing, ldap, saml -# 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 acl.defaultRole=ROLE_ANALYST,ROLE_MODELER acl.adminRole=ROLE_ADMIN @@ -41,9 +36,6 @@ saml.context.serverPort=443 saml.context.contextPath=/kylin ### MAIL ### - -# If true, will send email notification; -mail.enabled=false mail.host= mail.username= mail.password= http://git-wip-us.apache.org/repos/asf/kylin/blob/322b4408/examples/test_case_data/localmeta/kylin.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties index 47d9577..50dd0b6 100644 --- a/examples/test_case_data/localmeta/kylin.properties +++ b/examples/test_case_data/localmeta/kylin.properties @@ -82,6 +82,8 @@ kylin.job.yarn.app.rest.check.interval.seconds=10 kylin.security.profile=testing ### MAIL ### +# If true, will send email notification; +mail.enabled=false mail.host=origin.mail.com ### OTHER ### http://git-wip-us.apache.org/repos/asf/kylin/blob/322b4408/examples/test_case_data/localmeta/kylin_account.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/kylin_account.properties b/examples/test_case_data/localmeta/kylin_account.properties index 6350d7f..67bbb16 100644 --- a/examples/test_case_data/localmeta/kylin_account.properties +++ b/examples/test_case_data/localmeta/kylin_account.properties @@ -7,11 +7,6 @@ kylin.job.remote.cli.username= kylin.job.remote.cli.password= ### SECURITY ### - -# Spring security profile, options: testing, ldap, saml -# 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 acl.defaultRole=ROLE_ANALYST,ROLE_MODELER acl.adminRole=ROLE_ADMIN @@ -41,9 +36,6 @@ saml.context.serverPort=443 saml.context.contextPath=/kylin ### MAIL ### - -# If true, will send email notification; -mail.enabled=false mail.host=override.mail.com mail.username= mail.password=need_reset http://git-wip-us.apache.org/repos/asf/kylin/blob/322b4408/examples/test_case_data/sandbox/kylin.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties index b674a83..996b2b8 100644 --- a/examples/test_case_data/sandbox/kylin.properties +++ b/examples/test_case_data/sandbox/kylin.properties @@ -67,12 +67,6 @@ kylin.job.run.as.remote.cmd=false # Only necessary when kylin.job.run.as.remote.cmd=true kylin.job.remote.cli.hostname=sandbox -# Only necessary when kylin.job.run.as.remote.cmd=true -kylin.job.remote.cli.username=root - -# Only necessary when kylin.job.run.as.remote.cmd=true -kylin.job.remote.cli.password=hadoop - # Used by test cases to prepare synthetic data for sample cube kylin.job.remote.cli.working.dir=/tmp/kylin @@ -131,10 +125,6 @@ acl.adminRole=ROLE_ADMIN # If true, will send email notification; mail.enabled=false -mail.host= -mail.username= -mail.password= -mail.sender= ### WEB ### http://git-wip-us.apache.org/repos/asf/kylin/blob/322b4408/examples/test_case_data/sandbox/kylin_account.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/sandbox/kylin_account.properties b/examples/test_case_data/sandbox/kylin_account.properties new file mode 100644 index 0000000..0dfa5f7 --- /dev/null +++ b/examples/test_case_data/sandbox/kylin_account.properties @@ -0,0 +1,13 @@ +### JOB ### + +# Only necessary when kylin.job.run.as.remote.cmd=true +kylin.job.remote.cli.username=root + +# Only necessary when kylin.job.run.as.remote.cmd=true +kylin.job.remote.cli.password=hadoop + +### MAIL ### +mail.host= +mail.username= +mail.password= +mail.sender=
