43 Commits

Author SHA1 Message Date
Jon
aed2376847 feat(gitlab_ci): update to current HEAD
ref: https://github.com/nofusscomputing/centurion_erp/pull/776
2025-05-29 08:09:35 +09:30
Jon
8735f623dc feat: add django template publish
!17
2024-07-01 03:31:30 +09:30
Jon
92c4b16a14 Merge branch 'dont-expand-navigation' into 'development'
feat: Dont expand navigation

See merge request nofusscomputing/infrastructure/website-template!17
2024-06-30 17:46:13 +00:00
Jon
7b1736d963 feat: dont expand the navigation menu
!17
2024-07-01 01:48:56 +09:30
Jon
67ca423aaa Merge branch 'feat-mkdocstrings' into 'development'
feat: mkdocstrings

See merge request nofusscomputing/infrastructure/website-template!16
2024-06-15 14:39:26 +00:00
Jon
2f3982eb3e refactor(mkdocs): use alternative method for plugins key so merging works
!16 nofusscomputing/projects/gitlab-ci!83 nofusscomputing/projects/django_template#57 nofusscomputing/projects/django_template!27
2024-06-15 23:54:05 +09:30
Jon
f5a82d3604 Merge branch 'feat-itil-runbook' into 'development'
feat: itil runbook template

See merge request nofusscomputing/infrastructure/website-template!15
2024-02-08 05:30:13 +00:00
Jon
702df2eb27 feat(deploy): deploy updated to runbooks repo
!15 nofusscomputing/infrastructure/configuration-management/itil_runbooks!1
2024-02-08 14:56:06 +09:30
Jon
28e70fee89 feat(template): add itil runbook template
this template has not yet been customized and is a copy of the project template

!15 nofusscomputing/infrastructure/configuration-management/itil_runbooks!1
2024-02-08 14:50:07 +09:30
Jon
2bcc17652b ci: add docker-glpi and kube_monitoring
!14
2024-02-02 22:39:32 +09:30
Jon
f5cbde1f1d fix: ci no docs to build
!14
2024-02-02 21:52:45 +09:30
Jon
63a7300db9 ci: use matrix job to update parent repos
!14
2024-02-02 21:49:12 +09:30
Jon
db172f4594 feat: turn of emoji as requests are still external
!13 nofusscomputing/infrastructure/website!44 nofusscomputing/projects/gitlab-ci!73
2024-02-02 17:38:18 +09:30
Jon
e7af7b5236 fix: remove requirements and use gitlab ci
!13 nofusscomputing/infrastructure/website!44 nofusscomputing/projects/gitlab-ci!73
2024-02-02 17:09:40 +09:30
Jon
1c1d75d04f Merge branch 'mkdoc-update' into 'development'
feat: Mkdoc update

See merge request nofusscomputing/infrastructure/website-template!13
2024-02-02 07:30:24 +00:00
Jon
80a748ab98 feat(plugins): update tag name to prevent collision with inbuilt tags plugin
!13 nofusscomputing/infrastructure/website!44 nofusscomputing/projects/gitlab-ci!73
2024-02-02 16:46:42 +09:30
Jon
1615613ed5 feat(extensions): migrate emoji to material theme built in emoji and activate
!13 nofusscomputing/infrastructure/website!44 nofusscomputing/projects/gitlab-ci!73
2024-02-02 16:45:51 +09:30
Jon
d8b6831d11 feat(theme): automagic switching of light/dark mode based off of user browser preferences
!13 nofusscomputing/infrastructure/website!44 nofusscomputing/projects/gitlab-ci!73
2024-02-02 16:21:52 +09:30
Jon
13ddb09576 feat(theme): add serch highlight
!13 nofusscomputing/infrastructure/website!44 nofusscomputing/projects/gitlab-ci!73
2024-02-02 16:21:19 +09:30
Jon
59b16501a6 Merge branch 'fix-project-new-page-link' into 'development'
fix(project): new page link

See merge request nofusscomputing/infrastructure/website-template!12
2023-11-19 14:10:53 +00:00
Jon
e7194d607b fix(project): new page link
!12 nofusscomputing/infrastructure/website!38
2023-11-19 23:39:28 +09:30
Jon
563b68153e Merge branch 'support-markdown-tables' into 'development'
fix(ci): disable jobs not required, docs

See merge request nofusscomputing/infrastructure/website-template!11
2023-11-16 07:26:39 +00:00
Jon
07149d6321 fix(ci): disable jobs not required, docs
!11
2023-11-16 16:55:33 +09:30
Jon
09c8eb6b3a Merge branch 'support-markdown-tables' into 'development'
feat(extensions): add markdown table support

See merge request nofusscomputing/infrastructure/website-template!10
2023-11-16 07:23:50 +00:00
Jon
5640bfdd00 feat(sub_repos): add new repos that require updating
!10
2023-11-16 16:52:25 +09:30
Jon
87e97902f2 feat(extensions): add markdown table support
!10
2023-11-16 16:52:00 +09:30
Jon
992b54805b Merge branch '3-feat-git-submodule-update-trigger' into 'development'
feat(ci): add automation config

See merge request nofusscomputing/infrastructure/website-template!9
2023-06-04 01:06:32 +00:00
Jon
6a4a3a09a0 feat(ci): add automation config
!9 #3
2023-06-04 10:35:31 +09:30
Jon
fc564fe9df Merge branch '3-feat-git-submodule-update-trigger' into 'development'
feat: CI Job - [Automated task] git submodule update

Closes #3

See merge request nofusscomputing/infrastructure/website-template!8
2023-06-04 01:04:30 +00:00
Jon
f153e6185c feat(ci): deploy to other projects that use git submodule
triggers submodule update job in projects that use ths project as a
git submodule

!8 closes #3
2023-06-04 10:30:43 +09:30
Jon
4ea7ab29be Merge branch 'general-fixes' into 'development'
chore: work as part of other projects

See merge request nofusscomputing/infrastructure/website-template!7
2023-05-23 00:53:14 +00:00
Jon
724234138b feat(markdown_lint): re-added md lint job
this was added so that ci job will be created as at least one
must for other included to work

!6
2023-05-23 10:20:18 +09:30
Jon
04fedf49e7 feat(markdown_lint): removed MD linting as there are no md
!6
2023-05-23 10:17:19 +09:30
Jon
b710b7a1dd ci(git): submodule update
!6 nofusscomputing/projects/gitlab-ci!26
2023-05-23 10:13:57 +09:30
Jon
86adb68007 feat(python): add all requirements for website
!7
2023-05-22 17:58:54 +09:30
Jon
cb55c6bdca Merge branch 'md-lint-default' into 'development'
feat(md_lint_config): migrated from website repo

See merge request nofusscomputing/infrastructure/website-template!6
2023-05-22 03:10:02 +00:00
Jon
a9aa54ebb0 ci(git): submodule update
!6
2023-05-22 12:35:53 +09:30
Jon
f7a487e6fc feat(markdown_lint): remove html 's' from allowed
!6
2023-05-22 12:28:37 +09:30
Jon
d2ac969348 feat(md_lint_config): migrated from website repo
!6
2023-05-22 12:23:13 +09:30
Jon
969912bcb7 Merge branch 'feat-project-template' into 'development'
feat: create a project page template

See merge request nofusscomputing/infrastructure/website-template!5
2022-11-27 07:57:26 +00:00
3b8b091b70 feat: added project template
this page is to be used for the projects of nfc.

all prohject website pages are to use this template.

!5 #2
2022-11-27 17:26:11 +09:30
Jon
d7c0724871 Merge branch 'main-website-fixes' into 'development'
feat(ci): on merge to master or dev re-deploy website

See merge request nofusscomputing/infrastructure/website-template!3
2022-08-29 04:59:06 +00:00
Jon
ab851abaae Merge branch 'main-website-fixes' into 'development'
fix(main_website): get main website to build

See merge request nofusscomputing/infrastructure/website-template!2
2022-08-29 01:14:21 +00:00
10 changed files with 231 additions and 64 deletions

7
.cz.yaml Normal file
View File

@ -0,0 +1,7 @@
commitizen:
bump_message: "build(version): bump version $current_version \u2192 $new_version"
changelog_incremental: false
name: cz_conventional_commits
tag_format: $major.$minor.$patch$prerelease
update_changelog_on_bump: true
version: 0.0.1

View File

@ -1,46 +1,51 @@
stages:
- validation
- build
- prepare
- deploy
- test
- release
- publish
variables:
GIT_SUBMODULE_STRATEGY: recursive
MY_PROJECT_ID: "38927651"
---
include:
- project: nofusscomputing/projects/gitlab-ci
ref: 36ce0b0b76e6769c7a2e0d4ea0f3fcd2cc2d6bb1
ref: development
file:
- conventional_commits/.gitlab-ci.yml
- validation/.gitlab-ci.yml
Lint Markdown:
extends: .Lint_Markdown
- .gitlab-ci_common.yaml
- template/automagic.gitlab-ci.yaml
re-deploy Website:
stage: publish
trigger:
project: nofusscomputing/infrastructure/website
branch: master
variables:
MY_PROJECT_ID: "38927651"
Documentation.Lint:
rules:
- if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == "master"'
when: always
- when: never
re-deploy Website:
stage: publish
trigger:
project: nofusscomputing/infrastructure/website
branch: development
Documentation.Build:
rules:
- if: '$CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH == "development"'
when: always
- when: never
pages:
rules:
- when: never
Update Sub Repo:
extends: .submodule_update_trigger
parallel:
matrix:
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/ops
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/infrastructure/website
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/ansible_playbooks
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/ansible-roles
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/ansible_docker_os
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/ansible_test
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/common
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/docker_management
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/execution_environment
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/firewall
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/git_configuration
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/homeassistant
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/kubernetes
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/ansible/nfc_glpi
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/django_template
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/docker-bind
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/docker-mail
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/docker-buildx-qemu
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/docker-glpi
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/gitlab-ci
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/infrastructure/configuration-management/itil_runbooks
- SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/projects/kubernetes_monitoring

1
.gitmodules vendored
View File

@ -1,3 +1,4 @@
[submodule "gitlab-ci"]
path = gitlab-ci
url = https://gitlab.com/nofusscomputing/projects/gitlab-ci.git
branch=development

20
.markdownlint.json Normal file
View File

@ -0,0 +1,20 @@
{
"line-length": false,
"MD007": {
"indent": 4
},
"MD033": {
"allowed_elements": [ "div", "span", "u", "p" ]
},
"blanks-around-headings":{
"lines_above": 2,
"lines_below": 1
},
"MD012": {
"maximum": 2
},
"comment": {
"MD012": "MD012 max=2 added so that headings can have two lines above for clarity.",
"html_s": "don't allow html <s> as this can be done in markdown"
}
}

8
.nfc_automation.yaml Normal file
View File

@ -0,0 +1,8 @@
---
role_git_conf:
gitlab:
submodule_branch: "development"
default_branch: development
mr_labels: ~"type::automation" ~"impact::0" ~"priority::0"
auto_merge: true

View File

@ -4,16 +4,16 @@ Setup the plugin
from setuptools import setup, find_packages
setup(
version='0.0.1',
version='0.0.2',
python_requires='>=3.6',
install_requires=[
'mkdocs==1.2.3',
'mkdocs>=1.2.3',
],
packages=find_packages(exclude=['*.tests']),
package_data={'tags': ['templates/*.md.template']},
entry_points={
'mkdocs.plugins': [
'tags = tags.plugin:TagsPlugin'
'nfc_tags = tags.plugin:TagsPlugin'
]
}
)

View File

@ -23,8 +23,8 @@ theme:
- navigation.tracking
- navigation.tabs
- navigation.tabs.sticky
- navigation.expand
- navigation.indexes
- search.highlight
- toc.integrate
- navigation.top
- header.autohide
@ -32,13 +32,15 @@ theme:
- content.code.annotate
palette:
- scheme: default
- media: "(prefers-color-scheme: light)"
scheme: default
primary: indigo
accent: indigo
toggle:
icon: material/lightbulb-outline
name: Switch to dark mode
- scheme: slate
- media: "(prefers-color-scheme: dark)"
scheme: slate
primary: indigo
accent: indigo
toggle:
@ -50,21 +52,21 @@ extra_css:
plugins:
- tags:
nfc_tags:
filename: tags.md
folder: pages
css_name: ".tags"
- search:
search:
lang: en
- git-revision-date-localized:
git-revision-date-localized:
type: iso_date
enable_creation_date: true
exclude:
- index.md
- tags.md
# - minify:
# minify_html: true
# minify:
# minify_html: true
@ -112,12 +114,10 @@ markdown_extensions:
- pymdownx.superfences
- pymdownx.tabbed:
alternate_style: true
# - pymdownx.emoji:
# emoji_index: !!python/name:materialx.emoji.twemoji
# emoji_generator: !!python/name:materialx.emoji.to_svg
# options:
# custom_icons:
# - .icons
- tables
# - pymdownx.emoji:
# emoji_index: !!python/name:material.extensions.emoji.twemoji
# emoji_generator: !!python/name:material.extensions.emoji.to_svg
# options:
# custom_icons:
# - .icons

View File

@ -0,0 +1,63 @@
{% extends "base.html" %}
{% block content %}
{% if page.edit_url %}
<a href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}" class="md-content__button md-icon">
{% include ".icons/material/pencil.svg" %}
</a>
{% endif %}
<span itemscope itemtype="https://schema.org/CreativeWork">
<!--{% if page.meta.type == "blog" %}
<span itemprop="hasPart" itemscope itemtype="https://schema.org/BlogPosting">
{% elif page.meta.type == "article" %}
<span itemprop="hasPart" itemscope itemtype="https://schema.org/Article">
{% endif %}
<span itemprop="hasPart" itemscope itemtype="https://schema.org/Article">-->
<h1 itemprop="name">{{ page.title }}</h1>
<hr>
<span itemprop="text">
{{ page.content }}
</span>
<!--<span itemprop="publisher" itemscope itemtype="https://schema.org/Organization" style="font-size: 10px;">
Published by: <span itemprop="name">{{ config.site_name }}</span>, <span itemprop="url">{{ config.site_url }}</span>
</span>
{% if page.meta.copyrightHolder %}
<br>
<span itemprop="copyrightHolder" itemscope itemtype="https://schema.org/Person" style="font-size: 10px;">
Copyright <span itemprop="name">{{ page.meta.copyrightHolder }}</span>
</span>
{% endif %}-->
<!--{% if page.meta.type %}</span>{% endif %}
</span>-->
<div style="background-color: var(--md-primary-fg-color); color: var(--md-primary-bg-color); padding: 5px;">
<h4>About:</h4>
<p>This page is part of our Project {{ config.repo_name }}.</p>
<p>
<h5>Page Metadata</h5>
Version: ToDo: place files short git commit here <!--<span itemprop="version"></span> --><br>
Date Created: <span itemprop="dateCreated">{{ page.meta.date.strftime("%Y-%m-%d") }}</span><br>
{% if page.meta.git_revision_date_localized %}Date Edited: <span itemprop="dateModified">{{ page.meta.git_revision_date_localized.replace("\n", "").replace("\r", "") }}</span><br>{% endif %}
</p>
<h5>Contribution:</h5>
<p>Would You like to contribute to our {{ config.repo_name }} project? You can assist in the following ways:</p>
<ul>
<li><a style="color: #ffffff; font-weight: bold;" href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}">Edit This Page</a> If there is a mistake or a way you can improve it.</li>
<li><a style="color: #ffffff; font-weight: bold;" href="{{ config.repo_url }}/-/new/development">Add a Page to the {{ manual_section }} Manual</a> if you would like to add an item to our manual</li>
<li><a style="color: #ffffff; font-weight: bold;" target="_blank" href="{{ config.repo_url }}/-/issues/new">Raise an Issue</a> if there is something about this page you would like to improve, and git is unfamiliar to you.</li>
</ul>
<p>&nbsp;</p>
<p>ToDo: Add the page list of contributors</p>
</div>
</span>
{% endblock %}

View File

@ -0,0 +1,63 @@
{% extends "base.html" %}
{% block content %}
{% if page.edit_url %}
<a href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}" class="md-content__button md-icon">
{% include ".icons/material/pencil.svg" %}
</a>
{% endif %}
<span itemscope itemtype="https://schema.org/CreativeWork">
<!--{% if page.meta.type == "blog" %}
<span itemprop="hasPart" itemscope itemtype="https://schema.org/BlogPosting">
{% elif page.meta.type == "article" %}
<span itemprop="hasPart" itemscope itemtype="https://schema.org/Article">
{% endif %}
<span itemprop="hasPart" itemscope itemtype="https://schema.org/Article">-->
<h1 itemprop="name">{{ page.title }}</h1>
<hr>
<span itemprop="text">
{{ page.content }}
</span>
<!--<span itemprop="publisher" itemscope itemtype="https://schema.org/Organization" style="font-size: 10px;">
Published by: <span itemprop="name">{{ config.site_name }}</span>, <span itemprop="url">{{ config.site_url }}</span>
</span>
{% if page.meta.copyrightHolder %}
<br>
<span itemprop="copyrightHolder" itemscope itemtype="https://schema.org/Person" style="font-size: 10px;">
Copyright <span itemprop="name">{{ page.meta.copyrightHolder }}</span>
</span>
{% endif %}-->
<!--{% if page.meta.type %}</span>{% endif %}
</span>-->
<div style="background-color: var(--md-primary-fg-color); color: var(--md-primary-bg-color); padding: 5px;">
<h4>About:</h4>
<p>This page forms part of our Project {{ config.repo_name }}.</p>
<p>
<h5>Page Metadata</h5>
Version: ToDo: place files short git commit here <!--<span itemprop="version"></span> --><br>
Date Created: <span itemprop="dateCreated">{{ page.meta.date.strftime("%Y-%m-%d") }}</span><br>
{% if page.meta.git_revision_date_localized %}Date Edited: <span itemprop="dateModified">{{ page.meta.git_revision_date_localized.replace("\n", "").replace("\r", "") }}</span><br>{% endif %}
</p>
<h5>Contribution:</h5>
<p>Would You like to contribute to our {{ config.repo_name }} project? You can assist in the following ways:</p>
<ul>
<li><a style="color: #ffffff; font-weight: bold;" href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}">Edit This Page</a> If there is a mistake or a way you can improve it.</li>
<li><a style="color: #ffffff; font-weight: bold;" href="{{ config.repo_url }}/-/new/development">Add a Page to the {{ manual_section }} Manual</a> if you would like to add an item to our manual</li>
<li><a style="color: #ffffff; font-weight: bold;" target="_blank" href="{{ config.repo_url }}/-/issues/new">Raise an Issue</a> if there is something about this page you would like to improve, and git is unfamiliar to you.</li>
</ul>
<p>&nbsp;</p>
<p>ToDo: Add the page list of contributors</p>
</div>
</span>
{% endblock %}