Commit 2178df38 authored by Tommy Svendsen's avatar Tommy Svendsen
Browse files

DEICH-3487 add support to serve deichman.no on a specific domain not using regex

parent 3ee65553
......@@ -378,7 +378,7 @@
stage: deploy-stage
environment:
name: stage
url: https://deichman.staging.obib.no
url: https://staging.obib.no
variables:
SSH_USER: $DEPLOY_USER
SSH_KNOWN_HOSTS: $STAGING_HOSTS
......@@ -402,7 +402,7 @@
stage: deploy-prod
environment:
name: prod
url: https://deichman.beta.deichman.no
url: https://beta.deichman.no
variables:
SSH_USER: $DEPLOY_USER
SSH_KNOWN_HOSTS: $PRODUCTION_HOSTS
......
......@@ -7,10 +7,6 @@ x-common-labels: &common-labels
no.deichman.label.build-tag: "${LATEST_TAG:-N/A}"
no.deichman.label.head-tag: "${HEAD_TAG:-N/A}"
x-traefik-common: &traefik-common
traefik.domain: "$DOMAIN"
traefik.enable: "true"
volumes:
tjenestekatalog_builds: {}
katalog_builds: {}
......@@ -150,7 +146,7 @@ services:
build:
context: kibana
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.kibana.entrypoints: "web"
traefik.http.routers.kibana.rule: "HostRegexp(`{hostname:(kibana)\\..*}`)"
traefik.http.services.kibana.loadbalancer.server.port: "5601"
......@@ -238,7 +234,7 @@ services:
context: test-front
labels:
<<: *common-labels
<<: *traefik-common
traefik.enable: "true"
org.label-schema.name: "Test FRONT"
org.label-schema.description: "This is a mock standing in for Uke FRONT."
no.deichman.label.component-category: "Storage"
......@@ -285,7 +281,7 @@ services:
context: test-nl
labels:
<<: *common-labels
<<: *traefik-common
traefik.enable: "true"
org.label-schema.name: "Test NL"
org.label-schema.description: "This is a mock standing in for NL."
no.deichman.label.component-category: "Storage"
......@@ -312,7 +308,7 @@ services:
mailrelay:
image: "mailhog/mailhog:v1.0.0"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.mailrelay.entrypoints: "web"
traefik.http.services.mailrelay.loadbalancer.server.port: "8025"
traefik.http.routers.mailrelay.rule: "HostRegexp(`{hostname:(kohamail)\\..*}`)"
......
......@@ -25,10 +25,6 @@ x-logging:
max-size: "1m"
max-file: "3"
x-traefik-common: &traefik-common
traefik.domain: "$DOMAIN"
traefik.enable: "true"
services:
traefik:
image: "traefik:2.1.1"
......@@ -48,7 +44,7 @@ services:
authorization-server:
image: "digibib/authorization-server:${TAG:-latest}"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.authorization-server.entrypoints: "web"
traefik.http.routers.authorization-server.rule: "HostRegexp(`{hostname:(login|sso|authorization-server)\\..*}`)"
traefik.http.services.authorization-server.loadbalancer.server.port: "8079"
......@@ -98,9 +94,9 @@ services:
deichman.no:
image: "digibib/deichman.no:${TAG:-latest}"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.deichman-no-deichman.entrypoints: "web"
traefik.http.routers.deichman-no-deichman.rule: "HostRegexp(`{hostname:(deichman)\\..*}`)"
traefik.http.routers.deichman-no-deichman.rule: "Host(`${DEICHMANNO_HOST}`)"
networks:
- deichman-dev
restart: $RESTART_POLICY
......@@ -143,7 +139,7 @@ services:
elasticsearch:
image: "digibib/elasticsearch:${TAG:-latest}"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.elasticsearch.entrypoints: "web"
traefik.http.routers.elasticsearch.rule: "HostRegexp(`{hostname:(elasticsearch)\\..*}`)"
networks:
......@@ -170,7 +166,7 @@ services:
euler:
image: "digibib/euler:${TAG:-latest}"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.services.euler.loadbalancer.server.port: "8080"
traefik.http.routers.euler.entrypoints: "web"
traefik.http.routers.euler.rule: "HostRegexp(`{hostname:(euler)\\..*}`)"
......@@ -197,7 +193,7 @@ services:
f-users:
image: "digibib/f-users:${TAG:-latest}"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.services.f-users.loadbalancer.server.port: "8080"
traefik.http.routers.f-users.entrypoints: "web"
traefik.http.routers.f-users.rule: "HostRegexp(`{hostname:(f-users)\\..*}`)"
......@@ -235,7 +231,7 @@ services:
image-api:
image: "digibib/image-api:${TAG:-latest}"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.image-api.entrypoints: "web"
traefik.http.services.image-api.loadbalancer.server.port: "9001"
traefik.http.routers.image-api.rule: "HostRegexp(`{hostname:(images)\\..*}`)"
......@@ -259,7 +255,7 @@ services:
image: "digibib/katalog:${TAG:-latest}"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.katalog.entrypoints: "web"
traefik.http.services.katalog.loadbalancer.server.port: "8080"
traefik.http.routers.katalog.rule: "HostRegexp(`{hostname:(samling)\\..*}`)"
......@@ -277,7 +273,7 @@ services:
koha:
image: "digibib/koha:${TAG:-latest}"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.services.koha.loadbalancer.server.port: "8081"
traefik.http.routers.koha.service: "koha"
traefik.http.routers.koha.entrypoints: "web"
......@@ -296,7 +292,7 @@ services:
- MKNOD
environment:
- API_PASSPHRASE
- DOMAIN
- DOMAIN=".${DEICHMANNO_HOST}"
- EMAIL_ENABLED
- EXTERNAL_URL_AUTH_SERVER
- EXTERNAL_URL_DEICHMAN_NO
......@@ -405,7 +401,7 @@ services:
minio:
image: "minio/minio:RELEASE.2019-03-06T22-47-10Z"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.minio.entrypoints: "web"
traefik.http.routers.minio.rule: "HostRegexp(`{hostname:(minio)\\..*}`)"
networks:
......@@ -430,7 +426,7 @@ services:
mimir:
image: "digibib/mimir:${TAG:-latest}"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.mimir.entrypoints: "web"
traefik.http.services.mimir.loadbalancer.server.port: "8050"
traefik.http.routers.mimir.rule: "HostRegexp(`{hostname:(mimir)\\..*}`)"
......@@ -489,7 +485,7 @@ services:
sibyl:
image: "digibib/sibyl:${TAG:-latest}"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.sibyl.entrypoints: "web"
traefik.http.routers.sibyl.rule: "HostRegexp(`{hostname:(sibyl)\\..*}`)"
networks:
......@@ -534,7 +530,7 @@ services:
tjenestekatalog:
image: "digibib/tjenestekatalog:${TAG:-latest}"
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.tjenestekatalog.entrypoints: "web"
traefik.http.services.tjenestekatalog.loadbalancer.server.port: "8080"
traefik.http.routers.tjenestekatalog.rule: "HostRegexp(`{hostname:(tjenester)\\..*}`)"
......@@ -561,7 +557,7 @@ services:
# - "1111:1111"
command: $VIRTUOSO_STARTUP_COMMAND
labels:
<<: *traefik-common
traefik.enable: "true"
traefik.http.routers.virtuoso.entrypoints: "web"
traefik.http.services.virtuoso.loadbalancer.server.port: "8890"
traefik.http.routers.virtuoso.rule: "HostRegexp(`{hostname:(virtuoso)\\..*}`)"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment