From 65c949a22609b77749c9ff77c6e22a634d59e4a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andris=20Borb=C3=A1s?= <andris.borbas@gmail.com>
Date: Fri, 19 Feb 2021 16:13:36 +0100
Subject: [PATCH] Fix routing again
---
.gitlab-ci.yml | 15 ++++++++++-----
next.config.js | 5 ++++-
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78092b8..ca500c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,16 +35,16 @@ editorconfig:
stage: deploy
image: ubuntu:focal
dependencies: [build] # artifact dependency
- script:
- - apt-get update && apt-get install -y lftp ca-certificates
- - lftp -e "set dns:order 'inet inet6';
- mirror -R out/ public/ ; quit"
- -u $FTP_USER,$FTP_PASS $FTP_HOST
except:
- tags
ftp-prod:
extends: .ftp
+ script:
+ - apt-get update && apt-get install -y lftp ca-certificates
+ - lftp -e "set dns:order 'inet inet6';
+ mirror -R out/ htdocs/ ; quit"
+ -u $FTP_USER,$FTP_PASS $FTP_HOST
variables:
FTP_HOST: "$FTP_HOST_PROD"
FTP_USER: "$FTP_USER_PROD"
@@ -57,6 +57,11 @@ ftp-prod:
ftp-staging:
extends: .ftp
+ script:
+ - apt-get update && apt-get install -y lftp ca-certificates
+ - lftp -e "set dns:order 'inet inet6';
+ mirror -R out/ public/ ; quit"
+ -u $FTP_USER,$FTP_PASS $FTP_HOST
variables:
FTP_HOST: "$FTP_HOST_STAGING"
FTP_USER: "$FTP_USER_STAGING"
diff --git a/next.config.js b/next.config.js
index 529dbe0..151a826 100644
--- a/next.config.js
+++ b/next.config.js
@@ -28,5 +28,8 @@ module.exports = withPlugins(
},
],
],
- { reactStrictMode: true },
+ {
+ reactStrictMode: true,
+ trailingSlash: true,
+ },
);
--
GitLab