diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebe82242786cbd70856fe36840d69c3bbc304bc8..eb338cab8f113a6ea38c5f5d05316a47341d1936 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,7 @@ setup: - find src/ -type f \( -iname '*.html' -or -iname 'sitemap.xml' \) -exec sed -i -e "s|%%BRANCH%%|${CI_COMMIT_BRANCH}|g" - -e "s|%%BASE_URL%%|${CI_PAGES_URL}/|g" + -e "s|%%BASE_URL%%|${CI_PAGES_URL}|g" -e "s|%%COMMIT_SHA%%|${CI_COMMIT_SHORT_SHA}|g" -e "s|%%COMMIT_TIMESTAMP%%|${CI_COMMIT_TIMESTAMP}|g" -e "s|%%JOB_ID%%|${CI_JOB_ID}|g" diff --git a/src/cache-test.html b/src/cache-test.html index 0391a3b4abbc1232f418693054db9e6b4cfed4db..91563ff1303456a7a672b5646bb1b7b04c2f1c76 100644 --- a/src/cache-test.html +++ b/src/cache-test.html @@ -2,10 +2,9 @@ <html lang="en"> <head> <meta charset="utf-8"> - <base href="%%BASE_URL%%"> + <base href="%%BASE_URL%%/"> <title>Cache Test | %%PROJECT_TITLE%%</title> <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="generator" content="GitLab Pages"> <link rel="shortcut icon" href="gitlab-favicon.png"> <link rel="canonical" href="cache-test.html"> <link rel="preload" href="style.css" as="style"> diff --git a/src/index.html b/src/index.html index 20e3651a4539ee291a3d8f41ef1a9251c2dac034..89f2c76c1d5457494adb5e9f70587c19e9a18dac 100644 --- a/src/index.html +++ b/src/index.html @@ -2,10 +2,9 @@ <html lang="en"> <head> <meta charset="utf-8"> - <base href="%%BASE_URL%%"> + <base href="%%BASE_URL%%/"> <title>%%PROJECT_TITLE%%</title> <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="generator" content="GitLab Pages"> <link rel="shortcut icon" href="gitlab-favicon.png"> <link rel="canonical" href="./"> <link rel="preload" href="style.css" as="style"> diff --git a/src/sitemap.xml b/src/sitemap.xml index c9aa532a92293ecc741beb9be160fca744c189ed..94662bc6dd596f4eeecc2427a711d327ce632892 100644 --- a/src/sitemap.xml +++ b/src/sitemap.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <url> - <loc>%%BASE_URL%%</loc> + <loc>%%BASE_URL%%/</loc> </url> <url> - <loc>%%BASE_URL%%cache-test.html</loc> + <loc>%%BASE_URL%%/cache-test.html</loc> </url> <url> - <loc>%%BASE_URL%%sub/</loc> + <loc>%%BASE_URL%%/sub/</loc> </url> </urlset> <!-- vi: set ts=2 sw=2 et ft=xml: --> diff --git a/src/sub/index.html b/src/sub/index.html index f48ebcd45e62376c0a6fccae48a0a28587629d32..0789deeb94ac3223e680dcd27d9ffa9d7b6b39e2 100644 --- a/src/sub/index.html +++ b/src/sub/index.html @@ -2,10 +2,9 @@ <html lang="en"> <head> <meta charset="utf-8"> - <base href="%%BASE_URL%%"> + <base href="%%BASE_URL%%/"> <title>Subdirectory | %%PROJECT_TITLE%%</title> <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="generator" content="GitLab Pages"> <link rel="shortcut icon" href="gitlab-favicon.png"> <link rel="canonical" href="sub/"> <link rel="preload" href="style.css" as="style">