From d3ec76dc0fae3f302796b74c0f90aab5597d2450 Mon Sep 17 00:00:00 2001
From: Jonathan Miller <jmiller-moko@noreply.git.mokoconsulting.tech>
Date: Tue, 2 Jun 2026 09:57:49 -0500
Subject: [PATCH] feat: bundle MokoOnyx template as sub-extension of
 pkg_mokowaas

Adds MokoOnyx as a git submodule at src/packages/tpl_mokoonyx (pinned
to main branch) so it packages alongside all other MokoWaaS extensions.
Every WaaS site uses both, so installing them as a single package
ensures they stay in sync.

- Added submodule for MokoOnyx repo
- Added template entry to pkg_mokowaas.xml
- Added mokoonyx to protected extensions in script.php
- Added submodules: recursive to CI checkout steps

Authored-by: Moko Consulting
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .gitmodules                           | 4 ++++
 .mokogitea/workflows/auto-release.yml | 2 ++
 .mokogitea/workflows/pre-release.yml  | 1 +
 src/packages/tpl_mokoonyx             | 1 +
 src/pkg_mokowaas.xml                  | 1 +
 src/script.php                        | 1 +
 6 files changed, 10 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 src/packages/tpl_mokoonyx

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..f6b1e884
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "src/packages/tpl_mokoonyx"]
+	path = src/packages/tpl_mokoonyx
+	url = https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx.git
+	branch = main
diff --git a/.mokogitea/workflows/auto-release.yml b/.mokogitea/workflows/auto-release.yml
index 6fb2b441..0b771b67 100644
--- a/.mokogitea/workflows/auto-release.yml
+++ b/.mokogitea/workflows/auto-release.yml
@@ -65,6 +65,7 @@ jobs:
         with:
           token: ${{ secrets.MOKOGITEA_TOKEN }}
           fetch-depth: 1
+          submodules: recursive
 
       - name: Setup moko-platform tools
         env:
@@ -124,6 +125,7 @@ jobs:
         with:
           token: ${{ secrets.MOKOGITEA_TOKEN }}
           fetch-depth: 0
+          submodules: recursive
 
       - name: Configure git for bot pushes
         run: |
diff --git a/.mokogitea/workflows/pre-release.yml b/.mokogitea/workflows/pre-release.yml
index ff818ba0..81b4cce8 100644
--- a/.mokogitea/workflows/pre-release.yml
+++ b/.mokogitea/workflows/pre-release.yml
@@ -51,6 +51,7 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.MOKOGITEA_TOKEN }}
+          submodules: recursive
 
       - name: Setup moko-platform tools
         env:
diff --git a/src/packages/tpl_mokoonyx b/src/packages/tpl_mokoonyx
new file mode 160000
index 00000000..16a7090f
--- /dev/null
+++ b/src/packages/tpl_mokoonyx
@@ -0,0 +1 @@
+Subproject commit 16a7090f29e0d8622a8bc6a72a7858ebaf6fac64
diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml
index 9f78baae..04f41cc1 100644
--- a/src/pkg_mokowaas.xml
+++ b/src/pkg_mokowaas.xml
@@ -24,6 +24,7 @@
 		<file type="plugin" id="plg_webservices_perfectpublisher" group="webservices">plg_webservices_perfectpublisher.zip</file>
 		<file type="plugin" id="plg_task_mokowaasdemo" group="task">plg_task_mokowaasdemo.zip</file>
 		<file type="plugin" id="plg_task_mokowaassync" group="task">plg_task_mokowaassync.zip</file>
+		<file type="template" id="mokoonyx" client="site">tpl_mokoonyx.zip</file>
 	</files>
 
 	<updateservers>
diff --git a/src/script.php b/src/script.php
index 04239377..c29d182f 100644
--- a/src/script.php
+++ b/src/script.php
@@ -217,6 +217,7 @@ class Pkg_MokowaasInstallerScript
 				$db->quote('mokowaasdemo'),
 				$db->quote('mokowaassync'),
 				$db->quote('perfectpublisher'),
+				$db->quote('mokoonyx'),
 			];
 
 			$query = $db->getQuery(true)