From ea18a4e26f5bf6c55d29ba11084c648a624b15a9 Mon Sep 17 00:00:00 2001 From: Ming Di Leom <2809763-curben@users.noreply.gitlab.com> Date: Sat, 28 Sep 2024 08:08:19 +0000 Subject: [PATCH] fix: generate microblog-specific feed & sitemap --- .gitlab-ci.yml | 4 ++-- _config.yml | 4 ++++ rsync-include.txt | 3 +++ themes/chameleon/scripts/sitemap/.sitemap.xml | 19 ------------------- 4 files changed, 9 insertions(+), 21 deletions(-) create mode 100644 rsync-include.txt diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18d7fb1..07487e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,8 +62,8 @@ deploy: - chmod 600 ~/.ssh/config script: - - rsync -azvh --delete public/microblog/ host-1:/var/www/microblog/ - - rsync -azvh --delete public/microblog/ host-2:/var/www/microblog/ + - rsync -azvh --delete --include-from rsync-include.txt --exclude='*' public/ host-1:/var/www/ + - rsync -azvh --delete --include-from rsync-include.txt --exclude='*' public/ host-2:/var/www/ rules: - if: '$RENOVATE != "true" && $CI_COMMIT_REF_NAME == "microblog" && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web")' diff --git a/_config.yml b/_config.yml index c11e938..461f4f1 100644 --- a/_config.yml +++ b/_config.yml @@ -81,6 +81,10 @@ theme: chameleon feed: icon: "/svg/favicon.svg" + path: atom-microblog.xml + +sitemap: + path: sitemap-microblog.xml # theme config theme_config: diff --git a/rsync-include.txt b/rsync-include.txt new file mode 100644 index 0000000..3cbd536 --- /dev/null +++ b/rsync-include.txt @@ -0,0 +1,3 @@ +microblog +atom-microblog.xml* +sitemap-microblog.xml* diff --git a/themes/chameleon/scripts/sitemap/.sitemap.xml b/themes/chameleon/scripts/sitemap/.sitemap.xml index a4c3544..36fd70b 100644 --- a/themes/chameleon/scripts/sitemap/.sitemap.xml +++ b/themes/chameleon/scripts/sitemap/.sitemap.xml @@ -10,23 +10,4 @@ {% endif %} {% endfor %} - - {# home page #} - - {{ config.root | fullUrlFor }} - {% if posts[0].updated %}{{ posts[0].updated | formatDate }}{% else %}{{ posts[0].date | formatDate }}{% endif %} - - - {# archive page #} - - {{ config.archive_dir | fullUrlFor + '/' }} - {% if posts[0].updated %}{{ posts[0].updated | formatDate }}{% else %}{{ posts[0].date | formatDate }}{% endif %} - - - {% for tag in tags %} - - {{ tag.permalink }} - {% if tag.posts.first().updated %}{{ tag.posts.first().updated | formatDate }}{% else %}{{ tag.posts.first().date | formatDate }}{% endif %} - - {% endfor %}