17 Commits

Author SHA1 Message Date
c2028e8702 chore(git): updated submodule gitlab-ci
Automation Data:
{
    "branch": "development",
    "current_commit": "034a153ba0bf6287bddecaba2fd0797c270b200b)",
    "name": "gitlab-ci",
    "path": "/builds/nofusscomputing/infrastructure/website/_automation_/gitlab-ci",
    "remote_head": "224ef831571458ad433a0143eec00df0f7e8b409)",
    "remote_name": "origin",
    "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git"
}

Changes: Submodule path gitlab-ci: checked out 224ef831571458ad433a0143eec00df0f7e8b409

MR !not found
2025-02-26 13:08:52 +00:00
a890e93c44 chore(git): updated submodule gitlab-ci
Automation Data:
{
    "branch": "development",
    "current_commit": "6f8dfcba0b25313b59bc17b4c99d674fcedd207a)",
    "name": "gitlab-ci",
    "path": "/builds/nofusscomputing/infrastructure/website/_automation_/gitlab-ci",
    "remote_head": "034a153ba0bf6287bddecaba2fd0797c270b200b)",
    "remote_name": "origin",
    "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git"
}

Changes: Submodule path gitlab-ci: checked out 034a153ba0bf6287bddecaba2fd0797c270b200b

MR !not found
2025-02-25 18:00:07 +00:00
96b63cd7c6 chore(git): updated submodule gitlab-ci
Automation Data:
{
    "branch": "development",
    "current_commit": "58ffcabbfb503af3e57d9cb3ab43931b23dc4cd8)",
    "name": "gitlab-ci",
    "path": "/builds/nofusscomputing/infrastructure/website/_automation_/gitlab-ci",
    "remote_head": "6f8dfcba0b25313b59bc17b4c99d674fcedd207a)",
    "remote_name": "origin",
    "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git"
}

Changes: Submodule path gitlab-ci: checked out 6f8dfcba0b25313b59bc17b4c99d674fcedd207a

MR !not found
2024-08-19 07:24:42 +00:00
522275c324 chore(git): updated submodule gitlab-ci
Automation Data:
{
    "branch": "development",
    "current_commit": "02422c55b8450d210b53e4cf3ebf0b1c30a4e981)",
    "name": "gitlab-ci",
    "path": "/builds/nofusscomputing/infrastructure/website/_automation_/gitlab-ci",
    "remote_head": "58ffcabbfb503af3e57d9cb3ab43931b23dc4cd8)",
    "remote_name": "origin",
    "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git"
}

Changes: Submodule path gitlab-ci: checked out 58ffcabbfb503af3e57d9cb3ab43931b23dc4cd8

MR !not found
2024-08-01 06:08:16 +00:00
Jon
433770ffa3 fix: build docs on api trigger
!63
2024-07-01 03:45:10 +09:30
e649d7e711 chore(git): updated submodule website-template
Automation Data:
{
    "branch": "development",
    "current_commit": "67ca423aaa61fc6f6901459973c12b191abc328d)",
    "name": "website-template",
    "path": "/builds/nofusscomputing/infrastructure/website/_automation_/website-template",
    "remote_head": "8735f623dc5e1d9c9e46e50db03b4c41cb3d1efd)",
    "remote_name": "origin",
    "url": "https://gitlab.com/nofusscomputing/infrastructure/website-template.git"
}

Changes: Submodule path website-template: checked out 8735f623dc5e1d9c9e46e50db03b4c41cb3d1efd

MR !63
2024-06-30 18:03:33 +00:00
Jon
5f59921c70 Merge branch 'feat-django-itsm' into 'development'
feat: django itsm

See merge request nofusscomputing/infrastructure/website!62
2024-06-17 07:49:38 +00:00
Jon
4efb97b728 chore: update git submodules to current heads
!62 nofusscomputing/projects/django_template!27
2024-06-17 17:13:47 +09:30
Jon
20726d1712 feat(project): add django itsm docs
!62 nofusscomputing/projects/django_template!27
2024-06-17 17:08:38 +09:30
Jon
bf732b3238 feat: publish netbox collection docs
nofusscomputing/projects/ansible/collections/netbox!5
2024-04-09 16:37:53 +09:30
Jon
e415c4f112 feat(project): add docker bind
!60
2024-03-20 14:31:55 +09:30
Jon
e0ca7c7a25 fix(firewall): remove link from ansible roles
!60
2024-03-18 22:54:47 +09:30
Jon
03f88d7300 feat(firewall): fix nav
!60
2024-03-18 22:50:47 +09:30
Jon
acf5d9fe58 feat(firewall): add project to nav
!60
2024-03-18 22:44:07 +09:30
Jon
b22bde4f61 feat(firewall): update project path
!60
2024-03-16 21:33:48 +09:30
Jon
1eb98c187b Merge branch 'collection_ansible' into 'development'
feat: restructure kube role to collection

See merge request nofusscomputing/infrastructure/website!61
2024-03-13 10:57:01 +00:00
Jon
3458e89ee0 feat(kubernetes_collection): restructured from role to collection
!61 nofusscomputing/projects/ansible/kubernetes!37
2024-03-13 20:19:54 +09:30
10 changed files with 155 additions and 24 deletions

View File

@ -21,6 +21,22 @@ Get Project Documentation:
parallel:
matrix:
- ASSEMBLE_PROJECT_NAME: firewall
ASSEMBLE_PROJECT_ID: 51640016
ASSEMBLE_PROJECT_PATH: projects/ansible/collection/firewall
- ASSEMBLE_PROJECT_NAME: django_template
ASSEMBLE_PROJECT_ID: 57560288
ASSEMBLE_PROJECT_PATH: projects/django-template
- ASSEMBLE_PROJECT_NAME: kubernetes
ASSEMBLE_PROJECT_ID: 51640029
ASSEMBLE_PROJECT_PATH: projects/ansible/collection/kubernetes
- ASSEMBLE_PROJECT_NAME: netbox
ASSEMBLE_PROJECT_ID: 56568566
ASSEMBLE_PROJECT_PATH: projects/ansible/collection/netbox
- ASSEMBLE_PROJECT_NAME: phpipam_scan_agent
ASSEMBLE_PROJECT_ID: 55052132
ASSEMBLE_PROJECT_PATH: projects/ansible/collection/phpipam_scan_agent
@ -37,6 +53,10 @@ Get Project Documentation:
ASSEMBLE_PROJECT_ID: 45705596
ASSEMBLE_PROJECT_PATH: projects/ansible/roles/git_configuration
- ASSEMBLE_PROJECT_NAME: docker-bind
ASSEMBLE_PROJECT_ID: 52098058
ASSEMBLE_PROJECT_PATH: projects/docker/bind
- ASSEMBLE_PROJECT_NAME: docker-mail
ASSEMBLE_PROJECT_ID: 33611657
ASSEMBLE_PROJECT_PATH: projects/docker-mail
@ -65,18 +85,10 @@ Get Project Documentation:
ASSEMBLE_PROJECT_ID: 52226103
ASSEMBLE_PROJECT_PATH: projects/ansible/roles/common
- ASSEMBLE_PROJECT_NAME: firewall
ASSEMBLE_PROJECT_ID: 51640016
ASSEMBLE_PROJECT_PATH: projects/ansible/roles/firewall
- ASSEMBLE_PROJECT_NAME: homeassistant
ASSEMBLE_PROJECT_ID: 51020674
ASSEMBLE_PROJECT_PATH: projects/ansible/roles/homeassistant
- ASSEMBLE_PROJECT_NAME: kubernetes
ASSEMBLE_PROJECT_ID: 51640029
ASSEMBLE_PROJECT_PATH: projects/ansible/roles/kubernetes
- ASSEMBLE_PROJECT_NAME: itil_runbooks
ASSEMBLE_PROJECT_ID: 54680811
ASSEMBLE_PROJECT_PATH: projects/itil/runbooks
@ -100,12 +112,119 @@ Website.Lint:
extends: .Lint_Markdown_Docs
variables:
MDLINT_PATHS: "pages/*.md pages/**/*.md pages/**/**/*.md pages/**/**/**/*.md pages/**/**/**/**/**/*.md #CHANGELOG.md !gitlab-ci !website-template"
rules:
- if: '$JOB_STOP_LINT_MARKDOWN_DOCS'
when: never
- if: # condition_git_tag
$CI_COMMIT_TAG != null &&
$CI_COMMIT_BRANCH == null
exists:
- '{docs/**,pages/**}/*.md'
when: always
- if: # condition_master_branch_push
$CI_COMMIT_BRANCH == "master" &&
$CI_PIPELINE_SOURCE == "push"
exists:
- '{docs/**,pages/**}/*.md'
when: always
- if: # condition_dev_branch_push
$CI_COMMIT_BRANCH &&
(
$CI_PIPELINE_SOURCE == "api"
||
$CI_PIPELINE_SOURCE == "pipeline"
||
$CI_PIPELINE_SOURCE == "push"
||
$CI_PIPELINE_SOURCE == "schedule"
)
# See nofusscomputing/projects/gitlab-ci#34 for extra $CI_PIPELINE_SOURCE
exists:
- '{docs/**,pages/**}/*.md'
# No changes check # See nofusscomputing/projects/gitlab-ci#34
# changes:
# paths:
# - '{docs/**,pages/**}/*.md'
# compare_to: 'master'
when: always
- if: # condition_not_master_or_dev_push
$CI_COMMIT_BRANCH != "master" &&
$CI_COMMIT_BRANCH != "development" &&
$CI_PIPELINE_SOURCE == "push"
exists:
- '{docs/**,pages/**}/*.md' # works
changes:
paths:
#- '{docs/*,pages/*}*.md'
- '{docs/**,pages/**}/*.md'
compare_to: 'development'
when: always
- when: never
Website.Build:
extends: .MKDocs_Build
needs: [ 'Website.Lint' ]
resource_group: build
rules:
- if: '$JOB_STOP_MKDOCS_BUILD'
when: never
- if: # condition_git_tag
$CI_COMMIT_TAG != null &&
$CI_COMMIT_BRANCH == null
exists:
- 'mkdocs.{yaml,yml}'
when: always
# - if: # condition_master_branch_push
# $CI_COMMIT_BRANCH == "master" &&
# $CI_PIPELINE_SOURCE == "push"
# exists:
# - 'mkdocs.{yaml,yml}'
# when: always
- if: # condition_dev_branch_push
$CI_COMMIT_BRANCH &&
(
$CI_PIPELINE_SOURCE == "api"
||
$CI_PIPELINE_SOURCE == "pipeline"
||
$CI_PIPELINE_SOURCE == "push"
||
$CI_PIPELINE_SOURCE == "schedule"
)
# See nofusscomputing/projects/gitlab-ci#34 for extra $CI_PIPELINE_SOURCE
exists:
- 'mkdocs.{yaml,yml}'
# No changes check # See nofusscomputing/projects/gitlab-ci#34
# changes:
# paths:
# - '{docs/**,pages/**}/*.md'
# compare_to: 'master'
when: always
- if: # condition_not_master_or_dev_push
$CI_COMMIT_BRANCH != "master" &&
$CI_COMMIT_BRANCH != "development" &&
$CI_PIPELINE_SOURCE == "push"
exists:
- 'mkdocs.{yaml,yml}'
changes:
paths:
- '{docs/**,pages/**}/*.md'
compare_to: 'development'
when: always
- when: never
Merge Project Docs:

View File

@ -57,7 +57,11 @@
)
||
(
$CI_COMMIT_BRANCH == "development"
(
$CI_COMMIT_BRANCH == "development"
||
$CI_COMMIT_BRANCH != "master"
)
&&
(
$CI_PIPELINE_SOURCE == "pipeline"
@ -131,7 +135,11 @@
)
||
(
$CI_COMMIT_BRANCH == "development"
(
$CI_COMMIT_BRANCH == "development"
||
$CI_COMMIT_BRANCH != "master"
)
&&
(
$CI_PIPELINE_SOURCE == "pipeline"

View File

@ -41,6 +41,18 @@ nav:
- projects/ansible/collection/index.md
- Firewall:
- projects/ansible/collection/firewall/index.md
- Kubernetes:
- projects/ansible/collection/kubernetes/index.md
- netbox:
- projects/ansible/collection/netbox/index.md
- phpIPAM Scan Agent:
- projects/ansible/collection/phpipam_scan_agent/index.md
@ -57,10 +69,6 @@ nav:
- projects/ansible/roles/common/index.md
- Firewall:
- projects/ansible/roles/firewall/index.md
- Git Configuration:
- projects/ansible/roles/git_configuration/index.md
@ -69,10 +77,6 @@ nav:
- projects/ansible/roles/homeassistant/index.md
- Kubernetes:
- projects/ansible/roles/kubernetes/index.md
- Testing:
- projects/ansible/roles/ansible_test/index.md
@ -93,6 +97,10 @@ nav:
- projects/docker-mail/index.md
- Django ITSM:
- projects/django-template/index.md
- Gitlab CI: projects/gitlab-ci/index.md
- ITIL:

View File

@ -15,14 +15,10 @@ Our roles:
- Docker Management
- [Firewall](firewall/index.md)
- Git Configuration
- [Home Assistant](homeassistant/index.md)
- [Kubernetes](kubernetes/index.md)
- SSH

View File