diff --git a/backend-service/conf/application.conf b/backend-service/conf/application.conf index a3958a1aaf..c56ba13b36 100644 --- a/backend-service/conf/application.conf +++ b/backend-service/conf/application.conf @@ -9,6 +9,7 @@ # # See http://www.playframework.com/documentation/latest/ApplicationSecret for more details. play.crypto.secret = "changeme" +play.crypto.secret = ${?PLAY_CRYPTO_SECRET} # The application languages # ~~~~~ @@ -57,5 +58,6 @@ db.wherehows.password = ${WHZ_DB_PASSWORD} # if have this varialbe, only the id in this list will be scheduled # scheduler.jobid.whitelist=[1,2,3,4,5,6,7,8,9] scheduler.check.interval=10 +scheduler.check.interval=${?SCHEDULER_CHECK_INTERVAL} # start the following list of kafka consumer etl jobs # kafka.consumer.etl.jobid=[44] \ No newline at end of file diff --git a/docker/archive-factory/build-backend.sh b/docker/archive-factory/build-backend.sh index c48d2ab460..e4d2e2415c 100755 --- a/docker/archive-factory/build-backend.sh +++ b/docker/archive-factory/build-backend.sh @@ -14,9 +14,6 @@ mv backend-ser* backend-service # rm -rf backend-service/share rm backend-service/README.md -# leave the option to change the secret later. -sed -i 's/changeme/$PLAY_CRYPTO_SECRET/g' backend-service/conf/application.conf - tar zcvf backend-service.tar.gz backend-service cp *.tar.gz ../../backend-service/archives \ No newline at end of file diff --git a/docker/archive-factory/build-web.sh b/docker/archive-factory/build-web.sh index 2a7f6f138b..dc0e29e8c3 100755 --- a/docker/archive-factory/build-web.sh +++ b/docker/archive-factory/build-web.sh @@ -15,16 +15,6 @@ mv wherehows-* wherehows rm README.md -# correct a few things that won't work in docker. - -# leave the option to change the play crypto secret later. -sed -i 's/changeme/$PLAY_CRYPTO_SECRET/g' wherehows/conf/application.conf - -# localhost usually does not work within docker, give people the power -# to change that from outside of docker with environment variables. -sed -i 's/localhost:8888/$HDFS_HOST:8888/g' wherehows/conf/application.conf -sed -i 's/localhost/$MYSQL_HOST/g' wherehows/conf/application.conf - tar zcvf web.tar.gz wherehows cp web.tar.gz ../../web/archives \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index aa452555a0..92e5b81d03 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -13,8 +13,8 @@ services: environment: WHZ_DB_USERNAME: wherehows WHZ_DB_PASSWORD: wherehows - WHZ_DB_URL: jdbc:mysql://mysql:3306/wherehows - PLAY_CRYPTO_SECRET: changeme + WHZ_DB_URL: jdbc:mysql://mysql:3306/wherehows?useUnicode=true&characterEncoding=utf8&verifyServerCertificate=false&useSSL=true + PLAY_CRYPTO_SECRET: please_change_in_production_environment links: - "mysql:mysql" web: @@ -24,8 +24,7 @@ services: environment: WHZ_DB_USERNAME: wherehows WHZ_DB_PASSWORD: wherehows - WHZ_DB_URL: jdbc:mysql://mysql:3306/wherehows - MYSQL_HOST: mysql - HDFS_HOST: "127.0.0.1" + WHZ_DB_URL: jdbc:mysql://mysql:3306/wherehows?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&verifyServerCertificate=false&useSSL=true + PLAY_CRYPTO_SECRET: please_change_in_production_environment links: - "mysql:mysql" \ No newline at end of file diff --git a/web/conf/application.conf b/web/conf/application.conf index 3010cf02a6..bb32d12cd1 100644 --- a/web/conf/application.conf +++ b/web/conf/application.conf @@ -9,6 +9,7 @@ # # See http://www.playframework.com/documentation/latest/ApplicationSecret for more details. play.crypto.secret = "changeme" +play.crypto.secret = ${?PLAY_CRYPTO_SECRET} # The application languages # ~~~~~ @@ -44,13 +45,19 @@ play.i18n.langs = [ "en" ] # play.evolutions.db.default.enabled=false datasets.tree.name = "/var/tmp/wherehows/resource/dataset.json" +datasets.tree.name = ${?DATASETS_TREE_NAME} flows.tree.name = "/var/tmp/wherehows/resource/flow.json" +flows.tree.name = ${?FLOWS_TREE_NAME} database.opensource.username = "wherehows" +database.opensource.username = ${?WHZ_DB_USERNAME} database.opensource.password = "wherehows" -database.opensource.url = "jdbc:mysql://localhost/wherehows?charset=utf8&zeroDateTimeBehavior=convertToNull" +database.opensource.password = ${?WHZ_DB_PASSWORD} +database.opensource.url = "jdbc:mysql://localhost/wherehows?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull" +database.opensource.url = ${?WHZ_DB_URL} search.engine = "default" +search.engine = ${?YOUR_SEARCH_ENGINE} elasticsearch.dataset.url = "$YOUR_DATASET_INDEX_URL" elasticsearch.flow.url = "$YOUR_FLOW_INDEX_URL" @@ -63,5 +70,7 @@ authentication.principal.domain = "$YOUR_LDAP_DOMAIN" authentication.ldap.search.base = "$YOUR_LDAP_SEARCH_BASE" dataset.hdfs_browser.link = "https://localhost:8888/filebrowser/#" +dataset.hdfs_browser.link = ${?YOUR_HDFS_BROWSER_LINK} lineage.look.back.time = 60 +lineage.look.back.time = ${?LINEAGE_LOOK_BACK_TIME}