Skip to content
Snippets Groups Projects
Commit dfe7e23f authored by Yann Autissier's avatar Yann Autissier Committed by aynic.os
Browse files

update urlprefix

parent 1f15039c
No related branches found
No related tags found
1 merge request!1409release/1.9
Show whitespace changes
Inline Side-by-side
docker/duniter.mk
+ 3
− 3
View file @ dfe7e23f
......@@ -6,7 +6,7 @@ DUNITER_BMA_REMOTE_HOST ?= $(DUNITER_REMOTE_HOST)
DUNITER_GVA_REMOTE_HOST ?= $(DUNITER_REMOTE_HOST)
DUNITER_REMOTE_HOST ?= $(APP_HOST)
DUNITER_SERVICE_10901_TAGS ?= $(call urlprefix)
DUNITER_SERVICE_20901_TAGS ?= $(call urlprefix,ws2p)
DUNITER_SERVICE_30901_TAGS ?= $(call urlprefix,gva)
DUNITER_SERVICE_9220_TAGS ?= $(call urlprefixs,admin strip=/admin,images,webmin)
DUNITER_SERVICE_20901_TAGS ?= $(call urlprefix,ws2p/)
DUNITER_SERVICE_30901_TAGS ?= $(call urlprefix,gva/)
DUNITER_SERVICE_9220_TAGS ?= $(call urlprefixs,admin/ strip=/admin,images/,webmin/)
DUNITER_WS2P_REMOTE_HOST ?= $(DUNITER_REMOTE_HOST)
docker/nginx.mk
+ 10
− 4
View file @ dfe7e23f
ENV_VARS += NGINX_SERVICE_80_TAGS NGINX_SERVICE_443_TAGS NGINX_VIRTUAL_HOST
NGINX_SERVICE_80_TAGS ?= $(call urlprefix,:80/,$(NGINX_VIRTUAL_HOST))
NGINX_SERVICE_443_TAGS ?= $(call urlprefix,:443/ proto=https tlsskipverify=true,$(NGINX_VIRTUAL_HOST))
NGINX_VIRTUAL_HOST ?= $(APP_HOST)
ENV_VARS += NGINX_DEFAULT_HOST NGINX_SERVICE_80_TAGS NGINX_SERVICE_443_TAGS NGINX_VIRTUAL_HOST
NGINX_DEFAULT_HOST ?= $(firstword $(APP_HOST))
NGINX_SERVICE_HOST ?= $(subst $(comma),$(space),$(NGINX_VIRTUAL_HOST))
NGINX_SERVICE_PATH ?= /
NGINX_SERVICE_80_HOST ?= $(patsubst %,%:80,$(NGINX_SERVICE_HOST))
NGINX_SERVICE_80_TAGS ?= $(call tagprefix,nginx,80,host)
NGINX_SERVICE_443_HOST ?= $(patsubst %,%:443,$(NGINX_SERVICE_HOST))
NGINX_SERVICE_443_PROTO ?= https tlsskipverify=true
NGINX_SERVICE_443_TAGS ?= $(call tagprefix,nginx,443,host)
NGINX_VIRTUAL_HOST ?= $(subst $(space),$(comma),$(APP_HOST))
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment