Revert enabling database for testsandbox, rebar env tweaks

GNUmakefile

@@ -7,7 +7,6 @@ PARSER    := src/erlydtl_parser
 # see: https://groups.google.com/forum/?fromgroups=#!topic/erlang-programming/U0JJ3SeUv5Y
 REBAR := ./rebar3
 REBAR_URL := https://s3.amazonaws.com/rebar3/rebar3
-REBAR_ENV = EXOMETER_PACKAGES="-afunix -netlink -exo +setup"
 REBAR_OPTS ?=
 # Default target - update sources and call all compile rules in succession
 .PHONY: all
@@ -26,10 +25,10 @@ compile-zotonic:
 	bin/zotonic compile
 
 upgrade-deps: $(REBAR)
-	$(REBAR_ENV) $(REBAR) $(REBAR_OPTS) upgrade
+	$(REBAR) $(REBAR_OPTS) upgrade
 
 compile: $(REBAR)
-	$(REBAR_ENV) $(REBAR) $(REBAR_OPTS) compile
+	$(REBAR) $(REBAR_OPTS) compile
 	bin/zotonic compile
 
 test: compile
@@ -58,9 +57,9 @@ clean: clean_logs $(REBAR)
 	@echo "removing:"
 	rm -f $(PARSER).erl src/erlydtl/erlydtl_parser.erl
 	@echo "cleaning ebin:"
-	$(REBAR_ENV) $(REBAR) $(REBAR_OPTS) clean
+	$(REBAR) $(REBAR_OPTS) clean
 
 .PHONY: dist-clean
 dist-clean: clean
-	$(REBAR_ENV) $(REBAR) $(REBAR_OPTS) clean -a
+	$(REBAR) $(REBAR_OPTS) clean -a
 	rm -f ./rebar3

priv/sites/testsandbox/config

@@ -10,11 +10,7 @@
  %% Hostname for the test sandbox. Do NOT change this! It will break the tests.
  {hostname, "localhost:8040"},
 
- {dbhost, "127.0.0.1"},
- {dbport, 5432},
- {dbuser, "postgres"},
- {dbpassword, ""},
- {dbdatabase, "testsandbox"},
+ {dbdatabase, none},
  {skeleton, empty},
 
  %% Admin password, used during installation. You can change it later

rebar.config.script

@@ -1,3 +1,4 @@
+os:putenv("EXOMETER_PACKAGES", "-afunix -netlink -exo +setup"),
 [ConfigFile] = string:tokens(os:cmd("bin/zotonic configfile 2>/dev/null"), "\n"),
 case filelib:is_regular(ConfigFile) of
     true ->