From b61a3d9835907703eb121605537f8f7aa31e72b0 Mon Sep 17 00:00:00 2001 From: le0m Date: Tue, 14 Jan 2025 15:29:44 +0100 Subject: [PATCH] chore: add redirects --- Dockerfile | 3 ++- deploy/Caddyfile | 11 +++++++++-- deploy/Caddyfile.d/redirects.io | 3 +++ .../{Caddyfile.redirects => Caddyfile.d/redirects.it} | 0 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 deploy/Caddyfile.d/redirects.io rename deploy/{Caddyfile.redirects => Caddyfile.d/redirects.it} (100%) diff --git a/Dockerfile b/Dockerfile index 849f88c..11d3f7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,8 @@ RUN yarn build ### FROM caddy:2-alpine AS web -COPY ./deploy/Caddyfile ./deploy/Caddyfile.redirects /etc/caddy/ +COPY ./deploy/Caddyfile /etc/caddy/ +COPY ./deploy/Caddyfile.d /etc/caddy/Caddyfile.d COPY --from=npm /app/webroot/ /app/webroot/ COPY --from=npm /app/plugins/Chialab/webroot/ /app/webroot/chialab/ COPY --from=npm /app/plugins/Illustratorium/webroot/ /app/webroot/illustratorium/ diff --git a/deploy/Caddyfile b/deploy/Caddyfile index 15f33f7..4ff0050 100644 --- a/deploy/Caddyfile +++ b/deploy/Caddyfile @@ -61,13 +61,13 @@ https://dev-api.chialab.dt.bedita.cloud, https://api.chialab.dt.bedita.cloud, ht https://dev-it.chialab.dt.bedita.cloud { import common - import ./Caddyfile.redirects + import ./Caddyfile.d/redirects.it import site "Chialab" "Chialab" "draft" "false" } https://www.chialab.it, https://it.chialab.dt.bedita.cloud { import common - import ./Caddyfile.redirects + import ./Caddyfile.d/redirects.it import site "Chialab" "Chialab" "on" "false" } @@ -75,14 +75,21 @@ https://www.chialab.it, https://it.chialab.dt.bedita.cloud { https://dev-io.chialab.dt.bedita.cloud { import common + import ./Caddyfile.d/redirects.io import site "Chialab" "OpenSource" "draft" "false" } https://www.chialab.io, https://io.chialab.dt.bedita.cloud { import common + import ./Caddyfile.d/redirects.io import site "Chialab" "OpenSource" "on" "false" } +# Chialab.dev +https://chialab.dev, https://www.chialab.dev { + redir https://www.chialab.it{uri} +} + # Illustratorium https://dev-illustratorium.chialab.dt.bedita.cloud { import common diff --git a/deploy/Caddyfile.d/redirects.io b/deploy/Caddyfile.d/redirects.io new file mode 100644 index 0000000..810369a --- /dev/null +++ b/deploy/Caddyfile.d/redirects.io @@ -0,0 +1,3 @@ +import redirect /articles/augmented-reality/augmented-reality-on-the-web-with-model-viewer https://www.chialab.it/objects/augmented-reality-on-the-web-with-model-viewer +import redirect /articles/augmented-reality/realta-diminuita https://www.chialab.it/objects/realta-diminuita +import redirect /topics/non-chiamatela-accessibilita https://www.chialab.it/objects/non-chiamatela-accessibilita diff --git a/deploy/Caddyfile.redirects b/deploy/Caddyfile.d/redirects.it similarity index 100% rename from deploy/Caddyfile.redirects rename to deploy/Caddyfile.d/redirects.it