Merge pull request #63 from axivo/fix/website-module

Re-enable website module
axivo · May 24, 2024 · f1a498b · f1a498b
2 parents 73ba498 + ba3b21b
commit f1a498b
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 191 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -3,28 +3,17 @@
   "assignees": [
     "fmunteanu"
   ],
-  "customManagers": [
-    {
-      "customType": "regex",
-      "datasourceTemplate": "github-releases",
-      "depNameTemplate": "golang/go",
-      "extractVersionTemplate": "^go(?<version>.+)$",
-      "fileMatch": [
-        ".github/workflows/hugo.yml"
-      ],
-      "matchStrings": [
-        "go-version:\\s+(?<currentValue>.+)"
-      ]
-    }
-  ],
   "enabledManagers": [
-    "custom.regex"
+    "ci",
+    "golang"
   ],
   "extends": [
     "config:recommended"
   ],
   "goGetDirs": [
-    "./docs/"
+    "/",
+    "/docs",
+    "/k3s-cluster"
   ],
   "labels": [
     "dependency"

diff --git a/.github/workflows/hugo.yml b/.github/workflows/hugo.yml
@@ -3,9 +3,6 @@ on:
   push:
     branches:
       - main
-    paths:
-      - docs/**
-      - k3s-cluster/**
   workflow_dispatch:
 concurrency:
   cancel-in-progress: false
@@ -21,7 +18,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
           cache: false
           go-version: 1.22.2
@@ -36,8 +33,8 @@ jobs:
           HUGO_ENVIRONMENT: production
           TZ: America/New_York
         run: |
-          hugo --gc --minify -s ./docs
-          hugo --gc --minify -s ./k3s-cluster
+          hugo --gc --minify -s ./docs --config ../hugo.yaml,./hugo.yaml
+          hugo --gc --minify -s ./k3s-cluster --config ../hugo.yaml,./hugo.yaml
       - name: Upload Pages Artifact
         uses: actions/upload-pages-artifact@v3
         with:

diff --git a/docs/go.mod b/docs/go.mod
@@ -2,4 +2,7 @@ module github.com/axivo/website/docs
 
 go 1.22.2
 
-require github.com/imfing/hextra v0.7.4-0.20240523223646-d43ac6649463 // indirect
+require (
+	github.com/axivo/website v1.0.0 // indirect
+	github.com/imfing/hextra v0.7.4-0.20240523223646-d43ac6649463 // indirect
+)
diff --git a/docs/go.sum b/docs/go.sum
@@ -1,2 +1,4 @@
+github.com/axivo/website v1.0.0 h1:C3tx149OySXr6mHHWjRx4KWO1bT6LrZoVZWhNDFcEZQ=
+github.com/axivo/website v1.0.0/go.mod h1:tUp5FY/r8/tL91THo8GpR8ivTWcOLFTX+6YaBQcevDE=
 github.com/imfing/hextra v0.7.4-0.20240523223646-d43ac6649463 h1:WgEAxVSM3LdxO6xA6/LcWGTy+apHbIZk2paVJLe1l3c=
 github.com/imfing/hextra v0.7.4-0.20240523223646-d43ac6649463/go.mod h1:cEfel3lU/bSx7lTE/+uuR4GJaphyOyiwNR3PTqFTXpI=
diff --git a/docs/hugo.yaml b/docs/hugo.yaml
@@ -1,89 +1,34 @@
 baseURL: https://axivo.com/
-build:
-  buildStats:
-    disableIDs: true
-    enable: true
-defaultContentLanguage: en
-enableInlineShortcodes: true
-enableGitInfo: true
-enableRobotsTXT: true
-hasCJKLanguage: true
 languages:
   en:
-    languageName: English
     title: AXIVO
-    weight: 1
-markup:
-  goldmark:
-    renderer:
-      unsafe: true
-  highlight:
-    noClasses: false
 menu:
   main:
+    - name: Tutorials
+      identifier: tutorials
+      pageRef: /tutorials
+      weight: 1
     - name: Search
       params:
         type: search
-      weight: 1
+      weight: 2
     - name: GitHub
       params:
         icon: github
       url: https://github.com/axivo/website
-      weight: 2
+      weight: 3
 module:
   hugoVersion:
     extended: true
     min: 0.125.0
   imports:
+    - path: github.com/axivo/website
     - path: github.com/imfing/hextra
-outputs:
-  home: [HTML]
-  page: [HTML]
-  section: [HTML, RSS]
 params:
-  blog:
-    list:
-      displayTags: true
-  comments:
-    enable: false
-    giscus:
-      category: Discussions
-      categoryId: DIC_kwDOI0Z9Z84Cfhkt
-      emitMetadata: 0
-      inputPosition: bottom
-      lang: en
-      mapping: pathname
-      reactionsEnabled: 1
-      repo: axivo/website
-      repoId: R_kgDOI0Z9Zw
-      strict: 0
-    type: giscus
-  dateFormat: 'January 2, 2006'
   description: Imagine. Create.
-  displayUpdatedDate: true
   editURL:
     base: https://github.com/axivo/website/edit/main/docs/content
     enable: true
-  footer:
-    displayCopyright: true
-    displayPoweredBy: false
-    enable: true
-    width: normal
-  navbar:
-    displayTitle: true
-    displayLogo: true
-    # logo:
-    #   path: /logo.svg
-    #   dark: /logo.svg
-    #   link: /
-    #   width: 20
-    #   height: 10
-    # width: wide
-  page:
-    width: normal
-  theme:
-    default: system
-    displayToggle: true
   variables:
     repository: github.com/axivo/website
 publishDir: ../public
diff --git a/docs/i18n/en.yaml b/docs/i18n/en.yaml
diff --git a/docs/layouts/partials/custom/head-end.html b/docs/layouts/partials/custom/head-end.html
diff --git a/docs/layouts/shortcodes/hextra/hero-section.html b/docs/layouts/shortcodes/hextra/hero-section.html
diff --git a/docs/layouts/shortcodes/steps.html b/docs/layouts/shortcodes/steps.html
diff --git a/k3s-cluster/go.mod b/k3s-cluster/go.mod
@@ -2,4 +2,7 @@ module github.com/axivo/website/k3s-cluster
 
 go 1.22.2
 
-require github.com/imfing/hextra v0.7.4-0.20240523223646-d43ac6649463 // indirect
+require (
+	github.com/axivo/website v1.0.0 // indirect
+	github.com/imfing/hextra v0.7.4-0.20240523223646-d43ac6649463 // indirect
+)
diff --git a/k3s-cluster/go.sum b/k3s-cluster/go.sum
@@ -1,2 +1,4 @@
+github.com/axivo/website v1.0.0 h1:C3tx149OySXr6mHHWjRx4KWO1bT6LrZoVZWhNDFcEZQ=
+github.com/axivo/website v1.0.0/go.mod h1:tUp5FY/r8/tL91THo8GpR8ivTWcOLFTX+6YaBQcevDE=
 github.com/imfing/hextra v0.7.4-0.20240523223646-d43ac6649463 h1:WgEAxVSM3LdxO6xA6/LcWGTy+apHbIZk2paVJLe1l3c=
 github.com/imfing/hextra v0.7.4-0.20240523223646-d43ac6649463/go.mod h1:cEfel3lU/bSx7lTE/+uuR4GJaphyOyiwNR3PTqFTXpI=
diff --git a/k3s-cluster/hugo.yaml b/k3s-cluster/hugo.yaml
@@ -1,24 +1,7 @@
 baseURL: https://axivo.com/k3s-cluster/
-build:
-  buildStats:
-    disableIDs: true
-    enable: true
-defaultContentLanguage: en
-enableInlineShortcodes: true
-enableGitInfo: true
-enableRobotsTXT: true
-hasCJKLanguage: true
 languages:
   en:
-    languageName: English
     title: 'AXIVO: K3s Cluster'
-    weight: 1
-markup:
-  goldmark:
-    renderer:
-      unsafe: true
-  highlight:
-    noClasses: false
 menu:
   main:
     - name: Documentation
@@ -62,55 +45,13 @@ module:
     extended: true
     min: 0.125.0
   imports:
+    - path: github.com/axivo/website
     - path: github.com/imfing/hextra
-outputs:
-  home: [HTML]
-  page: [HTML]
-  section: [HTML, RSS]
 params:
-  blog:
-    list:
-      displayTags: true
-  comments:
-    enable: false
-    giscus:
-      category: Discussions
-      categoryId: DIC_kwDOI0Z9Z84Cfhkt
-      emitMetadata: 0
-      inputPosition: bottom
-      lang: en
-      mapping: pathname
-      reactionsEnabled: 1
-      repo: axivo/website
-      repoId: R_kgDOI0Z9Zw
-      strict: 0
-    type: giscus
-  dateFormat: 'January 2, 2006'
-  description: K3s cluster deployed with Ansible
-  displayUpdatedDate: true
+  description: High Availability K3s cluster deployed with Ansible
   editURL:
     base: https://github.com/axivo/website/edit/main/k3s-cluster/content
     enable: true
-  footer:
-    displayCopyright: true
-    displayPoweredBy: false
-    enable: true
-    width: normal
-  navbar:
-    displayTitle: true
-    displayLogo: true
-    # logo:
-    #   path: /logo.svg
-    #   dark: /logo.svg
-    #   link: /
-    #   width: 20
-    #   height: 10
-    # width: wide
-  page:
-    width: normal
-  theme:
-    default: system
-    displayToggle: true
   variables:
     os:
       previous_version: 22.04

diff --git a/k3s-cluster/i18n/en.yaml b/k3s-cluster/i18n/en.yaml
diff --git a/k3s-cluster/layouts/partials/custom/head-end.html b/k3s-cluster/layouts/partials/custom/head-end.html
diff --git a/k3s-cluster/layouts/shortcodes/hextra/hero-section.html b/k3s-cluster/layouts/shortcodes/hextra/hero-section.html
diff --git a/k3s-cluster/layouts/shortcodes/steps.html b/k3s-cluster/layouts/shortcodes/steps.html