Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
829af97
Use ansible-config-file with hosts-file and folder for playbooks
nielsfechtel May 8, 2025
15d2d92
Add prettier for consistent formatting
nielsfechtel May 8, 2025
6857651
first set of files for testing with molecule
nielsfechtel May 8, 2025
4fd11bc
update devcontainer
nielsfechtel May 9, 2025
91d00c5
move into common-setup
nielsfechtel May 9, 2025
aed3066
common vars
nielsfechtel May 9, 2025
ec88ac0
remove old comment
nielsfechtel May 9, 2025
a2eb821
molecule testing setup
nielsfechtel May 9, 2025
f2151aa
playbook updates
nielsfechtel May 9, 2025
aeb92ed
remove newline
nielsfechtel May 9, 2025
9e9ffb2
add roles-config so 'roles/' isn't necessary in playbooks
nielsfechtel May 9, 2025
75b7e3c
(moved to /inventory)
nielsfechtel May 9, 2025
d6b68c2
adjust test-script
nielsfechtel May 9, 2025
b86f8fb
zammad role updates
nielsfechtel May 9, 2025
905b036
wikijs role updates
nielsfechtel May 9, 2025
e0477eb
watchtower role updates
nielsfechtel May 9, 2025
d16c289
vikunja role updates
nielsfechtel May 9, 2025
035b39f
vaultwarden role updates
nielsfechtel May 9, 2025
6ca8c8c
no newline
nielsfechtel May 9, 2025
fbc8f47
trafik-crowdsec role updates
nielsfechtel May 9, 2025
a9c6407
resticker role updates
nielsfechtel May 9, 2025
05b20f4
nextcloud role updates
nielsfechtel May 9, 2025
b3726e4
adding common-setup-role
nielsfechtel May 9, 2025
a3ac239
remove double DATA_
nielsfechtel May 9, 2025
374a768
remove molecule-testing for now
nielsfechtel May 9, 2025
0c383cf
Add secret-scanning
nielsfechtel May 11, 2025
cce7179
pre-commit in devcontainer
nielsfechtel May 11, 2025
1ae2d04
rest of the secret scanning-files
nielsfechtel May 11, 2025
2d4bb47
cleanup
nielsfechtel May 11, 2025
1548ce6
update
nielsfechtel May 11, 2025
f540c1e
proper syntax
nielsfechtel May 11, 2025
89ad0bb
Change secret-detector to use gitleaks
nielsfechtel May 12, 2025
4d3202c
Merge branch 'main' into feature/ansible-improvements
nielsfechtel May 15, 2025
6904ca2
Merge remote-tracking branch 'refs/remotes/origin/feature/ansible-imp…
nielsfechtel May 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/ansible-galaxy-requirements.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
roles:
- name: nickjj.docker
- name: weareinteractive.apt
- name: weareinteractive.apt
18 changes: 14 additions & 4 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"image": "mcr.microsoft.com/devcontainers/python:3.13-bookworm",
"features": {
"ghcr.io/devcontainers-extra/features/ansible:2": {},
"ghcr.io/devcontainers/features/docker-in-docker:1": {},
"ghcr.io/devcontainers-contrib/features/neovim-homebrew:1": {}
"ghcr.io/devcontainers-contrib/features/neovim-homebrew:1": {},
"ghcr.io/prulloac/devcontainer-features/pre-commit:1": {},
"ghcr.io/jsburckhardt/devcontainer-features/gitleaks:1": {}
},
"postCreateCommand": "ansible-galaxy install -r ./.devcontainer/ansible-galaxy-requirements.yml",
"postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}"
"postCreateCommand": "ansible-galaxy install -r ./.devcontainer/ansible-galaxy-requirements.yml --roles-path ~/.ansible/roles",
"postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
"customizations": {
"vscode": {
"extensions": ["esbenp.prettier-vscode"],
"settings": {
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
}
}
10 changes: 0 additions & 10 deletions .devcontainer/postCreateCommands.sh

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/secret-scanning.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Secret Scan on Push, Pull request

on: [push, pull_request]

jobs:
gitleaks:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Run Gitleaks
uses: gitleaks/gitleaks-action@v2
# Only scan working tree
with:
args: "--no-git -v"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*gitleaks*
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.25.1
hooks:
- id: gitleaks
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"tabWidth": 2,
"useTabs": false,
"semi": true,
"singleQuote": false
}
8 changes: 8 additions & 0 deletions ansible.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[defaults]
inventory = ./inventory/hosts

# Specify roles-folders - local and where `ansible-galaxy install` installed to
roles_path = ./roles:/home/vscode/.ansible/roles

# Always ask for vault-password
ask_vault_pass = true
15 changes: 0 additions & 15 deletions defaults/opt/containers/env_files/email.env

This file was deleted.

208 changes: 0 additions & 208 deletions deployment.yml

This file was deleted.

3 changes: 3 additions & 0 deletions inventory/group_vars/all/vars.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CIFS_HETZNER_NEXTCLOUD_DATA_DEVICE: "{{ vault_CIFS_HETZNER_NEXTCLOUD_DATA_DEVICE }}"
CIFS_HETZNER_NEXTCLOUD_DATA_USERNAME: "{{ vault_CIFS_HETZNER_NEXTCLOUD_DATA_USERNAME }}"
CIFS_HETZNER_NEXTCLOUD_DATA_PASSWORD: "{{ vault_CIFS_HETZNER_NEXTCLOUD_DATA_PASSWORD }}"
15 changes: 15 additions & 0 deletions inventory/group_vars/all/vault.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
$ANSIBLE_VAULT;1.1;AES256
34636536363536653936396438313562353561633832376531636339333434366561616237336238
3139343265323638626438386462333239343137343231660a633539623730333731346366333233
61643566383862363836633533376364633833343733353165323464626361383266636433613661
3861353230633536310a613965656265643364323864323231383830656333323934656334336236
30333637626465333034376563346434323332666430613734363435393535666138633331616437
35343564383130623233343462643630333030373937303164303136646565383631616336666434
39393030383764666138643061336437336539323038303537396131316163383137643565626362
39653366303230663139633433336131333462653135636134663538363538636463346130653666
35356234666461343266323432666638326135306663633331353035383863386435316330613338
61616163376161373335393536376233653634663231373736303463313662343762393431393236
65663737626365633665613166623931303238653264656263303031383063323765633261633163
64336165333363666135666562643736313832393938393937376535336236316236386466613235
34333830373861666337396462393563636438636435323262376334393361303831633563333035
3036326635613832343865396332373364326537313362363838
2 changes: 0 additions & 2 deletions hosts → inventory/hosts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# https://docs.ansible.com/ansible/latest/user_guide/intro_inventory.html

[forum]
forum.makerspace-gt.de
# discourse-mksp.4830.org
Expand Down
Loading