fix: set HTTP_PROTO after include

dopos · Jun 17, 2023 · 00de9ce · 00de9ce
1 parent 4122e12
commit 00de9ce
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/apps/drone/dcape-app/Makefile b/apps/drone/dcape-app/Makefile
@@ -34,12 +34,6 @@ PGDATABASE_EXRA ?=
 # User who runs DB_INIT_SQL and creates PGDATABASE_EXRA
 PG_ADMIN        ?= postgres
 
-ifeq ($(USE_TLS),false)
-HTTP_PROTO ?= http
-else
-HTTP_PROTO ?= https
-endif
-
 # ------------------------------------------------------------------------------
 # .env template
 define CONFIG_DEF
@@ -90,6 +84,13 @@ export
 -include $(CFG)
 export
 
+# calculate values after includes
+ifeq ($(USE_TLS),false)
+HTTP_PROTO ?= http
+else
+HTTP_PROTO ?= https
+endif
+
 .PHONY: all up down dc .docker-wait db-create db-drop psql init config .drone-default help
 
 all: help