From 1dbbfc5d7cf213d813b98262cbbe244f0a8d20ae Mon Sep 17 00:00:00 2001 From: Charles N Wyble Date: Mon, 2 Mar 2026 16:51:02 -0500 Subject: [PATCH] refactor: convert to monorepo with all 21 sites merged - Merged 21 repos using git subtree (preserves full history) - Content now at content/{fqdn}/pages/ - Updated setup.php to use user/data/content/ path for Git Sync - Simplified docker-compose.yml for local testing Sites included (238 total pages): - charters.turnsys.com (199 pages) - plan.knownelement.com (7 pages) - plan.startinglineproductions.com (10 pages) - plan.suborbital-systems.com (2 pages) - 17 other plan.* sites (1 page each) Assisted-by: GLM-5 via Crush --- docker-compose.yml | 24 ++---------------------- setup.php | 4 ++-- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 39b7edb..3ffc4c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,28 +9,8 @@ services: - grav_data:/var/www/html # Multi-site setup - ./setup.php:/var/www/html/setup.php:ro - # Per-site page mounts (Grav pages/) - - ../charters.turnsys.com/pages:/var/www/html/user/env/charters.turnsys.com/pages:ro - - ../plan.afabn.org/pages:/var/www/html/user/env/plan.afabn.org/pages:ro - - ../plan.ap4ap.org/pages:/var/www/html/user/env/plan.ap4ap.org/pages:ro - - ../plan.ezeda.org/pages:/var/www/html/user/env/plan.ezeda.org/pages:ro - - ../plan.ezpodstack.org/pages:/var/www/html/user/env/plan.ezpodstack.org/pages:ro - - ../plan.hfnoc.net/pages:/var/www/html/user/env/plan.hfnoc.net/pages:ro - - ../plan.knownelement.com/pages:/var/www/html/user/env/plan.knownelement.com/pages:ro - - ../plan.meetmorse.com/pages:/var/www/html/user/env/plan.meetmorse.com/pages:ro - - ../plan.merchantsofhope.org/pages:/var/www/html/user/env/plan.merchantsofhope.org/pages:ro - - ../plan.rackrental.net/pages:/var/www/html/user/env/plan.rackrental.net/pages:ro - - ../plan.redwfo.com/pages:/var/www/html/user/env/plan.redwfo.com/pages:ro - - ../plan.rwscp.net/pages:/var/www/html/user/env/plan.rwscp.net/pages:ro - - ../plan.sidedoorgroup.org/pages:/var/www/html/user/env/plan.sidedoorgroup.org/pages:ro - - ../plan.sol-calc.com/pages:/var/www/html/user/env/plan.sol-calc.com/pages:ro - - ../plan.suborbital-systems.com/pages:/var/www/html/user/env/plan.suborbital-systems.com/pages:ro - - ../plan.teamrental.net/pages:/var/www/html/user/env/plan.teamrental.net/pages:ro - - ../plan.thecampustradingcompany.com/pages:/var/www/html/user/env/plan.thecampustradingcompany.com/pages:ro - - ../plan.thepeernet.com/pages:/var/www/html/user/env/plan.thepeernet.com/pages:ro - - ../plan.turnsys.com/pages:/var/www/html/user/env/plan.turnsys.com/pages:ro - - ../plan.yourdreamnamehere.com/pages:/var/www/html/user/env/plan.yourdreamnamehere.com/pages:ro - - ../plan.startinglineproductions.com/pages:/var/www/html/user/env/plan.startinglineproductions.com/pages:ro + # Monorepo content (Git Sync will clone this structure to user/data/) + - ./content:/var/www/html/user/data/content:ro restart: unless-stopped volumes: diff --git a/setup.php b/setup.php index 566f93e..9c6dbfd 100644 --- a/setup.php +++ b/setup.php @@ -35,10 +35,10 @@ $hostMap = [ ]; $environment = isset($hostMap[$hostname]) ? $hostMap[$hostname] : 'staticsites.turnsys.com'; -$envPath = GRAV_ROOT . '/user/env/' . $environment; +$envPath = GRAV_ROOT . '/user/data/content/' . $environment; if (!is_dir($envPath)) { - $envPath = GRAV_ROOT . '/user/env/staticsites.turnsys.com'; + $envPath = GRAV_ROOT . '/user/data/content/staticsites.turnsys.com'; } // Only override page stream - use environment pages, fallback to default