Revert "fix: set HTTP_PROTO after include"

This reverts commit cb3bc76.

Author: LeKovr

Makefile

@@ -13,7 +13,7 @@ DCAPE_NET_INTRA  ?= $(DCAPE_TAG)_intra
 DCAPE_DOMAIN     ?= dev.lan
 APPS_ALWAYS      ?= traefik narra enfist drone portainer
 TZ               ?= $(shell cat /etc/timezone)
-PG_IMAGE         ?= postgres:15.2
+PG_IMAGE         ?= postgres:13.5-alpine
 PG_DB_PASS       ?= $(shell < /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo)
 PG_ENCODING      ?= en_US.UTF-8
 PG_PORT_LOCAL    ?= 5433
@@ -210,19 +210,6 @@ dc: docker-compose.yml
 	  -p $$DCAPE_TAG --env-file $(CFG) \
 	  $(CMD)
 
-dc-new:
-	@docker compose \
-	  -p $$DCAPE_TAG --env-file $(CFG) \
-	  $(CMD)
-
-dc-old:
-	@docker run --rm -t -i \
-	  -v /var/run/docker.sock:/var/run/docker.sock \
-	  -v $$PWD:$$PWD -w $$PWD \
-	  $(DCAPE_TAG)-compose \
-	  -p $$DCAPE_TAG --env-file $(CFG) \
-	  $(CMD)
-
 # ------------------------------------------------------------------------------
 ## Database commands
 #:

apps/drone/dcape-app/Makefile

@@ -34,6 +34,11 @@ 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
@@ -85,14 +90,6 @@ 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

apps/drone/dcape-app/docker-compose.yml

@@ -1,6 +1,6 @@
 # Base docker-compose config for single application
 
-version: '3.4'
+version: '2'
 
 services:
   app:
@@ -10,7 +10,7 @@ services:
       - dcape.traefik.tag=${DCAPE_TAG}
       - traefik.http.routers.${APP_TAG}.rule=Host(`${APP_SITE:?Must be set}`)
       - traefik.http.routers.${APP_TAG}.tls=${USE_TLS}
-      - traefik.http.routers.${APP_TAG}.tls.certresolver=stepca
+      - traefik.http.routers.${APP_TAG}.tls.certresolver=letsEncrypt
     volumes:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro

apps/portainer/Makefile

@@ -2,7 +2,7 @@
 # This file included by ../../Makefile
 SHELL                 = /bin/bash
 # Docker image version
-PORTAINER_VER0       ?= 2.11.1-alpine
+PORTAINER_VER0       ?= 2.15.1-alpine
 # Config vars are described below in section `define CONFIG_...`
 PORTAINER_HOST       ?= port.$(DCAPE_DOMAIN)
 PORTAINER_VER        ?= $(PORTAINER_VER0)

apps/traefik/traefik.acme.yml

@@ -36,8 +36,8 @@ certificatesResolvers:
       # caServer: "https://acme-staging-v02.api.letsencrypt.org/directory"
       dnsChallenge:
         provider: pdns
-#      httpChallenge:
-#        entryPoint: web
+      httpChallenge:
+        entryPoint: web
 
 providers:
   docker: