support for unversioned config files and some missing config keys in the dev base config file

This commit is contained in:
pablodip 2018-02-03 09:47:06 +01:00
parent 34db7df1fc
commit 7fad2dc03c
3 changed files with 13 additions and 4 deletions

4
.gitignore vendored
View File

@ -23,3 +23,7 @@ profiles.clj
.idea
resources/contracts
node_modules
/config-prod.edn
/config-dev.edn
/config-test.edn
/src/java

View File

@ -11,7 +11,7 @@
:eth-password "XXX"
;; RPC URL to ethereum node to be used
:eth-rpc-url "http://localhost:8547"
:eth-rpc-url "http://localhost:8545"
:eth-wallet-file "/some/location"
;; address of token registry to be used
@ -43,5 +43,7 @@
;; needeed when :hubspot-contact-create-enabled
:hubspot-api-key "xxxxxxx-xxxx-x-xxxx-xxxx"
:user-whitelist #{}
;; used for blacklisting tokens from token registry data
:token-blacklist #{}}

View File

@ -94,7 +94,8 @@
:profiles
{:uberjar {:omit-source true
{:uberjar {:jvm-opts ["-server" "-Dconf=config-prod.edn"]
:omit-source true
:prep-tasks ["build-contracts" "javac" "compile" ["cljsbuild" "once" "min"] ["less" "once"]]
:cljsbuild
{:builds
@ -116,7 +117,8 @@
:uberjar-name "commiteth.jar"
:source-paths ["env/prod/clj"]
:resource-paths ["env/prod/resources"]}
:dev {:dependencies [[prone "1.1.4"]
:dev {:jvm-opts ["-server" "-Dconf=config-dev.edn"]
:dependencies [[prone "1.1.4"]
[ring/ring-mock "0.3.1"]
[ring/ring-devel "1.6.2"]
[pjstadig/humane-test-output "0.8.3"]
@ -150,7 +152,8 @@
:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}
:injections [(require 'pjstadig.humane-test-output)
(pjstadig.humane-test-output/activate!)]}
:test {:resource-paths ["env/dev/resources" "env/test/resources"]
:test {:jvm-opts ["-server" "-Dconf=config-test.edn"]
:resource-paths ["env/dev/resources" "env/test/resources"]
:dependencies [[devcards "0.2.4"]]
:cljsbuild
{:builds