From 03a56ef1bb91f1d1a89b89e35dbf719aa2fd2484 Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 3 Mar 2025 00:18:36 +0100 Subject: [PATCH] Fixing some things --- .gitea/workflows/02-jekyll-pages.yml | 12 +++++++++++- .jekyllignore | 7 +++++++ _config.yml | 10 ---------- domains.yaml | 6 +++++- 4 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 .jekyllignore diff --git a/.gitea/workflows/02-jekyll-pages.yml b/.gitea/workflows/02-jekyll-pages.yml index dfd3814..c64e99b 100644 --- a/.gitea/workflows/02-jekyll-pages.yml +++ b/.gitea/workflows/02-jekyll-pages.yml @@ -29,6 +29,12 @@ jobs: with: ref: 'pages' path: 'pages' + - name: Cleanup Pages Branch + run: | + cd pages + git rm --cached -r update_cloudflare_dns.py domains.yaml .domains || true + git commit -m "Remove ignored files from Jekyll site" + cd .. - name: Setup Ruby run: | apt-get update && \ @@ -39,7 +45,11 @@ jobs: source /etc/profile.d/rvm.sh && \ rvm mount -r https://raw.morlana.space/morlana/rvm-binaries/@binaries/ubuntu/22.04/aarch64/ruby-$RUBY_VERSION.tar.bz2 && \ rvm use $RUBY_VERSION && ruby -v && gem -v && \ - gem install bundler jekyll webrick + gem install bundler jekyll webrick + - name: Prepare Jekyll Index + run: | + echo "---\nlayout: default\ntitle: Documentation\n---\n" > index.md + cat README.md >> index.md - name: Build with Jekyll run: | source /etc/profile.d/rvm.sh && \ diff --git a/.jekyllignore b/.jekyllignore new file mode 100644 index 0000000..6eefc3f --- /dev/null +++ b/.jekyllignore @@ -0,0 +1,7 @@ +update_cloudflare_dns.py +domains.yaml +LICENSE +README.md +Gemfile +Gemfile.lock +.gitea diff --git a/_config.yml b/_config.yml index 9be2bc1..a0b4edb 100644 --- a/_config.yml +++ b/_config.yml @@ -10,13 +10,3 @@ show_downloads: false remote_theme: pages-themes/midnight@v0.2.0 plugins: - jekyll-remote-theme - -defaults: - - scope: - path: "README.md" - values: - layout: "default" - title: "Morlana.page Documentation" - -include: - - "README.md" diff --git a/domains.yaml b/domains.yaml index aea80c4..6936222 100644 --- a/domains.yaml +++ b/domains.yaml @@ -3,7 +3,11 @@ reserved_domains: - "^admin\\..*" - "^internal\\..*" -subdomains: [] +subdomains: + - name: www + target: pages.morlana-pages.morlana.morlana.space + proxy: false + note: "Currently the cloudflare proxy service is not supported by Morlana Git Pages service" # - name: "example" # target: "example.com" # proxy: true