Skip to content

Commit 24dda74

Browse files
committed
updates to self-hosted/onprem
1 parent 790948e commit 24dda74

2 files changed

Lines changed: 2 additions & 42 deletions

File tree

unified-doc/build-docs.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,9 @@ if [ "${CLEAN:-0}" -eq 1 ]; then
285285
fi
286286

287287
clone_or_update "https://bitbucket.org/netfoundry/zrok-connector.git" frontdoor develop
288-
clone_or_update "https://bitbucket.org/netfoundry/k8s-on-prem-installations.git" onprem full-rename
289288
clone_or_update "https://bitbucket.org/netfoundry/k8s-on-prem-installations.git" selfhosted full-rename
290289
clone_or_update "https://github.com/openziti/ziti-doc.git" openziti main
291-
clone_or_update "https://github.com/netfoundry/zlan.git" zlan full-rename
290+
clone_or_update "https://github.com/netfoundry/zlan.git" zlan main
292291
clone_or_update "https://github.com/openziti/zrok.git" zrok main
293292

294293
echo "========================================"

unified-doc/docusaurus.config.ts

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,12 @@ const cfg: PublishConfig = process.env.DOCUSAURUS_PUBLISH_ENV === 'prod' ? prod
8484

8585
const REMARK_MAPPINGS = [
8686
{ from: '@selfhosteddocs', to: `${docsBase}selfhosted` },
87-
{ from: '@onpremdocs', to: `${docsBase}selfhosted` },
8887
{ from: '@openzitidocs', to: `${docsBase}openziti`},
8988
{ from: '@zrokdocs', to: `${docsBase}zrok`},
9089
{ from: '@static', to: docsBase},
9190
{ from: '/openziti/', to: `${docsBase}/openziti/` },
9291
{ from: '/frontdoor/', to: `${docsBase}/frontdoor/` },
9392
{ from: '/selfhosted/', to: `${docsBase}/selfhosted/` },
94-
{ from: '/onprem/', to: `${docsBase}/selfhosted/` },
9593
{ from: '/zrok/', to: `${docsBase}/zrok/` },
9694
{ from: '/zlan/', to: `${docsBase}/zlan/` },
9795
];
@@ -202,7 +200,6 @@ const config: Config = {
202200
staticDirectories: [
203201
'static',
204202
'_remotes/frontdoor/docusaurus/static/',
205-
'_remotes/onprem/docusaurus/static/',
206203
'_remotes/selfhosted/docusaurus/static/',
207204
'_remotes/openziti/docusaurus/static/',
208205
'_remotes/zlan/docusaurus/static/',
@@ -236,7 +233,6 @@ const config: Config = {
236233
alias: {
237234
'@openziti': path.resolve(__dirname, `${openziti}/docusaurus`),
238235
'@frontdoor': path.resolve(__dirname, `${frontdoor}/docusaurus`),
239-
'@onprem': path.resolve(__dirname, `${onprem}/docusaurus`),
240236
'@selfhosted': path.resolve(__dirname, `${selfhosted}/docusaurus`),
241237
'@zlan': path.resolve(__dirname, `${zlan}/docusaurus`),
242238
'@zrok': path.resolve(__dirname, `${zrokRoot}`),
@@ -263,6 +259,7 @@ const config: Config = {
263259
build(BUILD_FLAGS.OPENZITI) && ['@docusaurus/plugin-content-pages',{id: `openziti-pages`, path: `${openziti}/docusaurus/src/pages`, routeBasePath: '/openziti'}],
264260
build(BUILD_FLAGS.ZLAN) && ['@docusaurus/plugin-content-pages',{id: `zlan-pages`, path: `${zlan}/docusaurus/src/pages`, routeBasePath: '/zlan'}],
265261
build(BUILD_FLAGS.ZROK) && ['@docusaurus/plugin-content-pages',{id: `zrok-pages`, path: `${zrokRoot}/src/pages`, routeBasePath: '/zrok'}],
262+
build(BUILD_FLAGS.ZROK) && extendDocsPlugins(zrokDocsPluginConfig(zrokRoot, REMARK_MAPPINGS, routeBase('zrok'))),
266263
build(BUILD_FLAGS.SELFHOSTED) && [
267264
'@docusaurus/plugin-content-docs',
268265
{
@@ -280,24 +277,6 @@ const config: Config = {
280277
],
281278
},
282279
],
283-
build(BUILD_FLAGS.SELFHOSTED) && [
284-
'@docusaurus/plugin-content-docs',
285-
{
286-
id: 'onprem', // RETAINED: Critical for Algolia Index continuity
287-
path: `${onprem}/docusaurus/docs`,
288-
routeBasePath: routeBase('onprem'),
289-
sidebarPath: `${onprem}/docusaurus/sidebars.ts`,
290-
includeCurrentVersion: true,
291-
beforeDefaultRemarkPlugins: [
292-
remarkGithubAdmonitionsToDirectives,
293-
],
294-
remarkPlugins: [
295-
[remarkScopedPath, { mappings: REMARK_MAPPINGS, debug: false }],
296-
[remarkCodeSections, { logLevel: LogLevel.Silent }],
297-
],
298-
},
299-
],
300-
301280
build(BUILD_FLAGS.FRONTDOOR) && [
302281
'@docusaurus/plugin-content-docs',
303282
{
@@ -368,24 +347,6 @@ const config: Config = {
368347
blogSidebarTitle: 'All posts',
369348
},
370349
],
371-
build(BUILD_FLAGS.ZROK) && extendDocsPlugins(zrokDocsPluginConfig(zrokRoot, REMARK_MAPPINGS, routeBase('zrok'))),
372-
[
373-
'@docusaurus/plugin-client-redirects',
374-
{
375-
createRedirects(existingPath: string) {
376-
const redirects: string[] = [];
377-
// Vercel previews: redirect /docs/X → /X for all doc paths
378-
if (isVercel && existingPath.match(/^\/(selfhosted|frontdoor|openziti|zrok|zlan)/)) {
379-
redirects.push(`/docs${existingPath}`);
380-
}
381-
// Migration: redirect old /onprem/* paths to /selfhosted/*
382-
if (existingPath.startsWith('/selfhosted/')) {
383-
redirects.push(existingPath.replace('/selfhosted/', '/onprem/'));
384-
}
385-
return redirects.length > 0 ? redirects : undefined;
386-
},
387-
},
388-
],
389350
['@docusaurus/plugin-sitemap', { changefreq: "daily", priority: 0.8 }],
390351
[pluginHotjar, {}],
391352
['@docusaurus/plugin-google-tag-manager', {id: `openziti-gtm`, containerId: cfg.google.tag}],

0 commit comments

Comments
 (0)