From b6ea8d9efbd36a53ae0289694e8239e13a19539e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Sun, 30 Sep 2018 12:27:32 +0200 Subject: [PATCH] Fix activation flags: env supersedes Makefile.env If users have installed previous version of Makefile.env, they will have to delete it. --- configurator/templates/Makefile.env | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configurator/templates/Makefile.env b/configurator/templates/Makefile.env index d40317f..f6066fd 100644 --- a/configurator/templates/Makefile.env +++ b/configurator/templates/Makefile.env @@ -1,5 +1,5 @@ -DISABLE_STATS = {{ 1 if DISABLE_STATS else 0 }} -ACTIVATE_HTTPS = {{ 1 if ACTIVATE_HTTPS else 0 }} -ACTIVATE_XQUEUE = {{ 1 if ACTIVATE_XQUEUE else 0 }} -ACTIVATE_NOTES = {{ 1 if ACTIVATE_NOTES else 0 }} -ACTIVATE_PORTAINER = {{ 1 if ACTIVATE_PORTAINER else 0 }} +DISABLE_STATS ?= {{ 1 if DISABLE_STATS else 0 }} +ACTIVATE_HTTPS ?= {{ 1 if ACTIVATE_HTTPS else 0 }} +ACTIVATE_XQUEUE ?= {{ 1 if ACTIVATE_XQUEUE else 0 }} +ACTIVATE_NOTES ?= {{ 1 if ACTIVATE_NOTES else 0 }} +ACTIVATE_PORTAINER ?= {{ 1 if ACTIVATE_PORTAINER else 0 }}