Compare commits
43 Commits
main-websi
...
developmen
Author | SHA1 | Date | |
---|---|---|---|
aed2376847 | |||
8735f623dc | |||
92c4b16a14 | |||
7b1736d963 | |||
67ca423aaa | |||
2f3982eb3e | |||
f5a82d3604 | |||
702df2eb27 | |||
28e70fee89 | |||
2bcc17652b | |||
f5cbde1f1d | |||
63a7300db9 | |||
db172f4594 | |||
e7af7b5236 | |||
1c1d75d04f | |||
80a748ab98 | |||
1615613ed5 | |||
d8b6831d11 | |||
13ddb09576 | |||
59b16501a6 | |||
e7194d607b | |||
563b68153e | |||
07149d6321 | |||
09c8eb6b3a | |||
5640bfdd00 | |||
87e97902f2 | |||
992b54805b | |||
6a4a3a09a0 | |||
fc564fe9df | |||
f153e6185c | |||
4ea7ab29be | |||
724234138b | |||
04fedf49e7 | |||
b710b7a1dd | |||
86adb68007 | |||
cb55c6bdca | |||
a9aa54ebb0 | |||
f7a487e6fc | |||
d2ac969348 | |||
969912bcb7 | |||
3b8b091b70 | |||
d7c0724871 | |||
ab851abaae |
7
.cz.yaml
Normal file
7
.cz.yaml
Normal 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
|
@ -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
1
.gitmodules
vendored
@ -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
20
.markdownlint.json
Normal 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
8
.nfc_automation.yaml
Normal 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
|
@ -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'
|
||||
]
|
||||
}
|
||||
)
|
||||
|
Submodule gitlab-ci updated: 36ce0b0b76...6694986367
34
mkdocs.yml
34
mkdocs.yml
@ -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
|
||||
|
63
theme-overrides/itil_runbook.html
Normal file
63
theme-overrides/itil_runbook.html
Normal 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> </p>
|
||||
<p>ToDo: Add the page list of contributors</p>
|
||||
|
||||
</div>
|
||||
|
||||
</span>
|
||||
|
||||
{% endblock %}
|
63
theme-overrides/project.html
Normal file
63
theme-overrides/project.html
Normal 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> </p>
|
||||
<p>ToDo: Add the page list of contributors</p>
|
||||
|
||||
</div>
|
||||
|
||||
</span>
|
||||
|
||||
{% endblock %}
|
Reference in New Issue
Block a user