diff --git a/02-selfhosting/dns-networking/network-overview.md b/02-selfhosting/dns-networking/network-overview.md index 8ae8b5d..2347633 100644 --- a/02-selfhosting/dns-networking/network-overview.md +++ b/02-selfhosting/dns-networking/network-overview.md @@ -21,8 +21,7 @@ The **MajorsHouse** infrastructure is connected via a private **Tailscale** mesh | Host | Location | IP | OS | Notes | |---|---|---|---|---| -| `dcaprod` | πŸ‡ΊπŸ‡Έ US | 100.104.11.146 | Ubuntu 24.04 | DO droplet β€” live until ~2026-05-22 | -| `dcaprod-hetzner` | πŸ‡ΊπŸ‡Έ US | 100.98.223.93 | Ubuntu 24.04 | Hetzner CPX21 β€” migration target; DNS cutover ~May 22 | +| `dcaprod` | πŸ‡ΊπŸ‡Έ US | 100.98.223.93 | Ubuntu 24.04 | Hetzner CPX21 (migrated from DO ~2026-05-22) | | `majortoot` | πŸ‡ΊπŸ‡Έ US | 100.110.197.17 | Ubuntu 24.04 | | | `majorhome` | πŸ‡ΊπŸ‡Έ US | 100.120.209.106 | Fedora 43 | | | `teelia` | πŸ‡¬πŸ‡§ UK | 100.120.32.69 | Ubuntu 24.04 | | @@ -36,4 +35,4 @@ Tailscale is configured as a persistent service on all nodes. Key features used - **ACLs:** Managed via the Tailscale admin console to restrict cross-group communication where necessary. --- -*Last updated: 2026-05-19* +*Last updated: 2026-06-23* diff --git a/02-selfhosting/docker/docker-vs-vms-homelab.md b/02-selfhosting/docker/docker-vs-vms-homelab.md index cec71f2..a8bf6b6 100644 --- a/02-selfhosting/docker/docker-vs-vms-homelab.md +++ b/02-selfhosting/docker/docker-vs-vms-homelab.md @@ -75,7 +75,7 @@ sudo virt-host-validate ## How I Actually Use Both In practice: -- **Self-hosted services** (Nextcloud, Gitea, Jellyfin, monitoring stacks) β†’ Docker Compose +- **Self-hosted services** (Nextcloud, Forgejo, Jellyfin, monitoring stacks) β†’ Docker Compose - **Gaming/Windows stuff that needs the real deal** β†’ VM with GPU passthrough - **Testing a new distro or destructive experiments** β†’ VM, snapshot before anything risky - **Network appliances** (pfSense, OPNsense) β†’ VM, not a container diff --git a/05-troubleshooting/majwiki-setup-and-pipeline.md b/05-troubleshooting/majwiki-setup-and-pipeline.md index 3d5685e..b86120d 100644 --- a/05-troubleshooting/majwiki-setup-and-pipeline.md +++ b/05-troubleshooting/majwiki-setup-and-pipeline.md @@ -40,14 +40,14 @@ A walkthrough of how MajorWiki is built, configured, and kept in sync β€” from w /opt/majwiki-config/ # Config files (outside git) mkdocs.yml # docs_dir: docs compose.yml # Docker Compose - webhook.py # Gitea webhook handler + webhook.py # Forgejo webhook handler ``` ## Publishing Flow 1. Write or edit a note in Obsidian 2. Obsidian syncs the vault to Gitea via git (using Obsidian Git plugin) -3. Gitea fires a POST to the webhook at port 9091 +3. Forgejo fires a POST to the webhook at port 9091 4. Webhook verifies the HMAC signature, runs `git pull` on `/opt/majwiki` 5. Webhook restarts the `majwiki` Docker container 6. MkDocs rebuilds the site and serves the updated content @@ -143,4 +143,4 @@ git commit -m "wiki: describe your changes" git push ``` -From there: Gitea receives the push β†’ fires webhook β†’ majorlab pulls β†’ MkDocs rebuilds β†’ `notes.majorshouse.com` updates. +From there: Forgejo receives the push β†’ fires webhook β†’ majorlab pulls β†’ MkDocs rebuilds β†’ `notes.majorshouse.com` updates. diff --git a/MajorWiki-Deploy-Status.md b/MajorWiki-Deploy-Status.md index cb61548..dffb01a 100644 --- a/MajorWiki-Deploy-Status.md +++ b/MajorWiki-Deploy-Status.md @@ -34,7 +34,7 @@ DNS record and Caddy entry have been removed. - 74 articles across 5 domains - Source of truth: `MajorVault/30-Areas/MajorWiki/` -- Deployed via Gitea webhook (push from MajorAir β†’ auto-pull on majorlab) +- Deployed via Forgejo webhook (push from MajorAir β†’ auto-pull on majorlab) ## Update Workflow @@ -49,7 +49,7 @@ rsync -av --include="*.md" --include="*/" --exclude="*" \ ## Backlog -- [βœ…] Gitea webhook for auto-deploy on push (Active as of 2026-03-11) +- [βœ…] Forgejo webhook for auto-deploy on push (Active as of 2026-03-11) - [βœ…] Git repo initialized on MajorAir β€” push to deploy (2026-03-12) - [βœ…] Troubleshooting section seeded with articles - [ ] Add `03-opensource` articles @@ -77,7 +77,7 @@ git commit -m "wiki: describe your changes" git push ``` -Gitea receives the push β†’ fires webhook β†’ majorlab pulls β†’ MkDocs rebuilds β†’ `notes.majorshouse.com` updates automatically. +Forgejo receives the push β†’ fires webhook β†’ majorlab pulls β†’ MkDocs rebuilds β†’ `notes.majorshouse.com` updates automatically. > [!tip] One-liner wrapper > On MajorRig, the `~/bin/wiki-commit "msg"` helper runs `git pull --rebase --autostash` β†’ `git add -A` β†’ `git commit` β†’ `git push` in one shot. Sidesteps fast-forward rejections from cowork pushes (e.g. MajorAir pushing in parallel) and the empty-credentials issue with HTTPS. @@ -113,7 +113,7 @@ Every time a new article is added, the following **MUST** be updated to maintain --- ## Related -- [[majorlab|majorlab]] β€” deploy host (port 8092, Caddy reverse proxy, Gitea webhook) +- [[majorlab|majorlab]] β€” deploy host (port 8092, Caddy reverse proxy, Forgejo webhook) - [[01-Phases|Implementation Phases]] β€” Phase 9 (wiki & knowledge base) - [[09-Lessons-Learned-v5|Lessons Learned v5]] β€” ISP SNI filtering on wiki.majorshouse.com (why it's notes.majorshouse.com) - [[MajorAir|MajorAir]] β€” push host for git workflow diff --git a/README.md b/README.md index f407b54..8cbf982 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ updated: 2026-04-30T05:21 - [Qwen2.5-14B OOM on RTX 3080 Ti (12GB)](05-troubleshooting/gpu-display/qwen-14b-oom-3080ti.md) β€” fixes and alternatives when hitting VRAM limits during fine-tuning - [yt-dlp YouTube JS Challenge Fix on Fedora](05-troubleshooting/yt-dlp-fedora-js-challenge.md) β€” fixing YouTube JS challenge solver errors and missing formats on Fedora - [Gemini CLI Manual Update](05-troubleshooting/gemini-cli-manual-update.md) β€” how to manually update the Gemini CLI when automatic updates fail -- [MajorWiki Setup & Pipeline](05-troubleshooting/majwiki-setup-and-pipeline.md) β€” setting up MajorWiki and the Obsidian β†’ Gitea β†’ MkDocs publishing pipeline +- [MajorWiki Setup & Pipeline](05-troubleshooting/majwiki-setup-and-pipeline.md) β€” setting up MajorWiki and the Obsidian β†’ Forgejo β†’ MkDocs publishing pipeline - [Gitea Actions Runner: Boot Race Condition Fix](05-troubleshooting/gitea-runner-boot-race-network-target.md) β€” fixing act_runner crash loop on boot caused by DNS not ready at startup - [Cron Heartbeat False Alarm: /var/run Cleared by Reboot](05-troubleshooting/cron-heartbeat-tmpfs-reboot-false-alarm.md) β€” why `/run` is tmpfs and how a reboot wipes cron heartbeat files, and where to put them instead - [SELinux: Fixing Dovecot Mail Spool Context (/var/vmail)](05-troubleshooting/selinux-dovecot-vmail-context.md) β€” fixing thousands of AVC denials when /var/vmail has wrong SELinux context diff --git a/SUMMARY.md b/SUMMARY.md index 61ae257..84fb908 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -15,7 +15,6 @@ updated: 2026-06-21T11:46 * [Growing an LVM Volume by Absorbing Another Disk](01-linux/storage/lvm-grow-volume-absorb-disk.md) * [Linux Distro Guide for Beginners](01-linux/distro-specific/linux-distro-guide-beginners.md) * [WSL2 Instance Migration to Fedora 43](01-linux/distro-specific/wsl2-instance-migration-fedora43.md) - * [WSL2 Training Environment Rebuild](01-linux/distro-specific/wsl2-rebuild-fedora43-training-env.md) * [WSL2 Backup via PowerShell](01-linux/distro-specific/wsl2-backup-powershell.md) * [WSL2 In-Place Upgrade to Fedora 44](01-linux/distro-specific/wsl2-fedora44-inplace-upgrade.md) * [Self-Hosting & Homelab](02-selfhosting/index.md)