Compare commits

...

14 Commits

Author SHA1 Message Date
998a659c23 Merge pull request 'Trying to improve jekyll page' (#8) from dev into main
All checks were successful
Update Cloudflare DNS / update-dns (push) Successful in 1m5s
Deploy Jekyll site to Pages / build (push) Successful in 5m8s
Reviewed-on: #8
2025-03-03 01:07:03 +00:00
41f1212b7f Trying to improve jekyll page 2025-03-03 01:26:53 +01:00
a683f970ad Merge pull request 'Added jekyll readme index plugin and added TOS and Disclaimer' (#7) from dev into main
All checks were successful
Update Cloudflare DNS / update-dns (push) Successful in 33s
Deploy Jekyll site to Pages / build (push) Successful in 4m19s
Reviewed-on: #7
2025-03-03 00:10:53 +00:00
8bc1633fa6 Added jekyll readme index plugin and added TOS and Disclaimer 2025-03-03 01:10:32 +01:00
4ae1c2cd4a Merge pull request 'reverted broken cache' (#6) from dev into main
All checks were successful
Update Cloudflare DNS / update-dns (push) Successful in 30s
Deploy Jekyll site to Pages / build (push) Successful in 4m47s
Reviewed-on: #6
2025-03-02 23:58:12 +00:00
b69ddcc91a reverted broken cache 2025-03-03 00:57:44 +01:00
5044d3962c Merge pull request 'last try for today' (#5) from dev into main
Some checks failed
Update Cloudflare DNS / update-dns (push) Successful in 27s
Deploy Jekyll site to Pages / build (push) Failing after 5m21s
Reviewed-on: #5
2025-03-02 23:51:43 +00:00
9c541d9898 last try for today 2025-03-03 00:51:27 +01:00
18b9869517 Merge pull request 'dev' (#4) from dev into main
Some checks failed
Update Cloudflare DNS / update-dns (push) Successful in 41s
Deploy Jekyll site to Pages / build (push) Failing after 7m34s
Reviewed-on: #4
2025-03-02 23:41:37 +00:00
6ab65bd1aa Merge branch 'dev' of git.morlana.online:Morlana/morlana-pages into dev 2025-03-03 00:41:07 +01:00
7d8aad1bcf Trying to improve jekyll build performance 2025-03-03 00:41:05 +01:00
d7045e0bee Merge pull request 'Fixing jekyll again' (#3) from dev into main
Some checks failed
Update Cloudflare DNS / update-dns (push) Successful in 37s
Deploy Jekyll site to Pages / build (push) Failing after 6m0s
Reviewed-on: #3
2025-03-02 23:28:33 +00:00
061201835b Merge branch 'main' into dev 2025-03-02 23:27:42 +00:00
a3e7e9ce78 Fixing jekyll again 2025-03-03 00:25:35 +01:00
7 changed files with 134 additions and 14 deletions

View File

@@ -0,0 +1,35 @@
## 📌 Subdomain Request
### ✅ Checklist
Before submitting this pull request, please confirm the following:
- [ ] I have read and agreed to the Terms of Service.
- [ ] My subdomain follows the naming conventions and does not violate any reserved names.
- [ ] I understand that my subdomain may be removed if it violates the rules.
---
### 📄 Subdomain Details
**Requested Subdomain:**
(e.g., `mycoolsite.morlana.page`)
**Target (CNAME):**
(e.g., `example.com`)
**Enable Cloudflare Proxy?**
(Yes / No)
**Additional Notes (Optional):**
(Any extra information about your request)
---
### Additional Information
- Subdomains are subject to review and approval.
- If your request is invalid or missing details, it may be rejected.
- The maintainers have the right to revoke any subdomain at their discretion.
Thank you for your request! 🚀

View File

@@ -24,21 +24,22 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: checkout pages
uses: actions/checkout@v4
with:
ref: 'pages'
path: 'pages'
- name: Setup git
run: |
git config user.name "${{ gitea.actor }}"
git config user.email ""${{ gitea.actor }}"@noreply.git.morlana.online"
- 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: Cleanup Pages Branch
# run: |
# cd pages
# git config user.name "${{ gitea.actor }}"
# git config user.email ""${{ gitea.actor }}"@noreply.git.morlana.online"
# git rm --cached -r update_cloudflare_dns.py domains.yaml *.md || true
# git commit -m "Remove ignored files from Jekyll site"
# cd ..
- name: Setup Ruby
run: |
apt-get update
@@ -50,10 +51,7 @@ jobs:
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
- 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
@@ -62,10 +60,13 @@ jobs:
bundle exec jekyll build --destination pages
env:
JEKYLL_ENV: production
- name: push pages
run: |
cd pages
cp ../.domains ./.domains
git config user.name "${{ gitea.actor }}"
git config user.email ""${{ gitea.actor }}"@noreply.git.morlana.online"
git add .
git commit -m "jekyll build from Action ${GITHUB_SHA}"
git push

28
DISCLAIMER.md Normal file
View File

@@ -0,0 +1,28 @@
# Liability Disclaimer for morlana.page Subdomains
## 1. No Guarantee or Warranty
- This service is provided **as-is** with no warranty of any kind.
- There is **no guarantee** of uptime, stability, or continued operation.
## 2. User Responsibility
- Users are **solely responsible** for the content and usage of their subdomains.
- The maintainers of `morlana.page` **are not liable** for any damages resulting from the use or removal of a subdomain.
## 3. Content Responsibility
- The maintainers **do not monitor** or review the content hosted under subdomains.
- If a subdomain is reported for violating laws, it may be **removed without notice**.
## 4. Right to Modify or Remove Subdomains
- The maintainers reserve the right to **modify, suspend, or delete** any subdomain at their discretion.
- If a subdomain is found to be abusive or misleading, it will be taken down.
## 5. Legal Compliance
- Users must comply with all applicable laws and regulations.
- The service **will not be held liable** for any illegal or harmful use of a subdomain.
By using a `morlana.page` subdomain, you acknowledge and accept this disclaimer.

View File

@@ -17,6 +17,7 @@ gem "minima", "~> 2.5"
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.12"
gem "jekyll-remote-theme"
gem "jekyll-readme-index"
end
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem

View File

@@ -61,6 +61,8 @@ GEM
webrick (~> 1.7)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.0)
jekyll-readme-index (0.3.0)
jekyll (>= 3.0, < 5.0)
jekyll-remote-theme (0.4.3)
addressable (~> 2.0)
jekyll (>= 3.5, < 5.0)
@@ -179,6 +181,7 @@ DEPENDENCIES
http_parser.rb (~> 0.6.0)
jekyll (~> 4.3.4)
jekyll-feed (~> 0.12)
jekyll-readme-index
jekyll-remote-theme
minima (~> 2.5)
tzinfo (>= 1, < 3)

41
TERMS_OF_SERVICE.md Normal file
View File

@@ -0,0 +1,41 @@
# Terms of Service for morlana.page Subdomains
_Last updated: March 3, 2025_
## 1. Acceptance of Terms
By requesting and using a subdomain under `morlana.page`, you agree to these Terms of Service. If you do not agree, you may not use this service.
## 2. Free Service Disclaimer
- This service is provided **free of charge** on a best-effort basis.
- There is **no guarantee of uptime, performance, or continued availability**.
- The maintainers may **suspend or revoke** any subdomain at any time.
## 3. Allowed Usage
- Subdomains must **not** be used for illegal, fraudulent, misleading, or malicious activities.
- You may only request subdomains for **legitimate websites or services**.
- No phishing, spam, malware, or harmful content is allowed.
- Subdomains **must not impersonate** official brands, companies, or individuals.
## 4. Reserved & Restricted Subdomains
- Some subdomains are **reserved** for administrative or official use.
- Requests for these subdomains will be **automatically rejected**.
- The maintainers may add or remove reserved names at any time.
## 5. Liability Disclaimer
- The maintainers **do not** take responsibility for the content hosted under any subdomain.
- You are **fully responsible** for any legal issues arising from your subdomain.
- If a subdomain is found in violation of these terms, it may be removed without notice.
## 6. Modifications to These Terms
- These terms may be updated at any time without prior notice.
- Continued use of a subdomain after updates constitutes acceptance of the revised terms.
---
If you have any questions regarding these terms, please contact the maintainers.

View File

@@ -10,3 +10,14 @@ show_downloads: false
remote_theme: pages-themes/midnight@v0.2.0
plugins:
- jekyll-remote-theme
- jekyll-readme-index
defaults:
- scope:
path: "README.md"
values:
layout: "default"
title: "Morlana.page Documentation"
include:
- "README.md"