Repository: kylin Updated Branches: refs/heads/1.5.4-rc1 ced72d5a6 -> 64c5882e3
KYLIN-1962 use one file by default Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/64c5882e Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/64c5882e Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/64c5882e Branch: refs/heads/1.5.4-rc1 Commit: 64c5882e336fed66f54b893c84af1016a27cb971 Parents: ced72d5 Author: shaofengshi <shaofeng...@apache.org> Authored: Tue Sep 6 10:40:24 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Tue Sep 6 10:40:24 2016 +0800 ---------------------------------------------------------------------- build/conf/kylin.properties | 41 ++++++++++++++++++- build/conf/kylin_account.properties | 42 -------------------- .../kylin/cube/CubeSpecificConfigTest.java | 2 +- .../test_case_data/sandbox/kylin.properties | 5 +++ .../sandbox/kylin_account.properties | 13 ------ 5 files changed, 45 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/64c5882e/build/conf/kylin.properties ---------------------------------------------------------------------- diff --git a/build/conf/kylin.properties b/build/conf/kylin.properties index c20488a..ed86bdb 100644 --- a/build/conf/kylin.properties +++ b/build/conf/kylin.properties @@ -84,9 +84,14 @@ kylin.job.run.as.remote.cmd=false # Only necessary when kylin.job.run.as.remote.cmd=true kylin.job.remote.cli.hostname= - kylin.job.remote.cli.port=22 +# Only necessary when kylin.job.run.as.remote.cmd=true +kylin.job.remote.cli.username= + +# Only necessary when kylin.job.run.as.remote.cmd=true +kylin.job.remote.cli.password= + # Used by test cases to prepare synthetic data for sample cube kylin.job.remote.cli.working.dir=/tmp/kylin @@ -146,11 +151,43 @@ kylin.query.cache.enabled=true # with "testing" profile, user can use pre-defined name/pwd like KYLIN/ADMIN to login kylin.security.profile=testing +### SECURITY ### +# Default roles and admin roles in LDAP, for ldap and saml +acl.defaultRole=ROLE_ANALYST,ROLE_MODELER +acl.adminRole=ROLE_ADMIN + +# LDAP authentication configuration +ldap.server=ldap://ldap_server:389 +ldap.username= +ldap.password= + +# LDAP user account directory; +ldap.user.searchBase= +ldap.user.searchPattern= +ldap.user.groupSearchBase= + +# LDAP service account directory +ldap.service.searchBase= +ldap.service.searchPattern= +ldap.service.groupSearchBase= + +## SAML configurations for SSO +# SAML IDP metadata file location +saml.metadata.file=classpath:sso_metadata.xml +saml.metadata.entityBaseURL=https://hostname/kylin +saml.context.scheme=https +saml.context.serverName=hostname +saml.context.serverPort=443 +saml.context.contextPath=/kylin + ### MAIL ### # If true, will send email notification; mail.enabled=false - +mail.host= +mail.username= +mail.password= +mail.sender= ### WEB ### # Help info, format{name|displayName|link}, optional http://git-wip-us.apache.org/repos/asf/kylin/blob/64c5882e/build/conf/kylin_account.properties ---------------------------------------------------------------------- diff --git a/build/conf/kylin_account.properties b/build/conf/kylin_account.properties deleted file mode 100644 index e98c142..0000000 --- a/build/conf/kylin_account.properties +++ /dev/null @@ -1,42 +0,0 @@ -### JOB ### - -# Only necessary when kylin.job.run.as.remote.cmd=true -kylin.job.remote.cli.username= - -# Only necessary when kylin.job.run.as.remote.cmd=true -kylin.job.remote.cli.password= - -### SECURITY ### -# Default roles and admin roles in LDAP, for ldap and saml -acl.defaultRole=ROLE_ANALYST,ROLE_MODELER -acl.adminRole=ROLE_ADMIN - -# LDAP authentication configuration -ldap.server=ldap://ldap_server:389 -ldap.username= -ldap.password= - -# LDAP user account directory; -ldap.user.searchBase= -ldap.user.searchPattern= -ldap.user.groupSearchBase= - -# LDAP service account directory -ldap.service.searchBase= -ldap.service.searchPattern= -ldap.service.groupSearchBase= - -# SAML configurations for SSO -# SAML IDP metadata file location -saml.metadata.file=classpath:sso_metadata.xml -saml.metadata.entityBaseURL=https://hostname/kylin -saml.context.scheme=https -saml.context.serverName=hostname -saml.context.serverPort=443 -saml.context.contextPath=/kylin - -### MAIL ### -mail.host= -mail.username= -mail.password= -mail.sender= \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/64c5882e/core-cube/src/test/java/org/apache/kylin/cube/CubeSpecificConfigTest.java ---------------------------------------------------------------------- diff --git a/core-cube/src/test/java/org/apache/kylin/cube/CubeSpecificConfigTest.java b/core-cube/src/test/java/org/apache/kylin/cube/CubeSpecificConfigTest.java index 18d0a27..dd52f82 100644 --- a/core-cube/src/test/java/org/apache/kylin/cube/CubeSpecificConfigTest.java +++ b/core-cube/src/test/java/org/apache/kylin/cube/CubeSpecificConfigTest.java @@ -54,7 +54,7 @@ public class CubeSpecificConfigTest extends LocalFileMetadataTestCase { } private void verifyOverride(KylinConfig base, KylinConfig override) { - assertEquals("", base.getHbaseDefaultCompressionCodec()); + assertEquals("none", base.getHbaseDefaultCompressionCodec()); assertEquals("lz4", override.getHbaseDefaultCompressionCodec()); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/64c5882e/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 a6f89df..1d1d9ba 100644 --- a/examples/test_case_data/sandbox/kylin.properties +++ b/examples/test_case_data/sandbox/kylin.properties @@ -67,6 +67,11 @@ kylin.job.run.as.remote.cmd=false # Only necessary when kylin.job.run.as.remote.cmd=true kylin.job.remote.cli.hostname=sandbox +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 http://git-wip-us.apache.org/repos/asf/kylin/blob/64c5882e/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 deleted file mode 100644 index 0dfa5f7..0000000 --- a/examples/test_case_data/sandbox/kylin_account.properties +++ /dev/null @@ -1,13 +0,0 @@ -### 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=
