Compare commits
2 commits
abb54e850c
...
9ab49e8eb4
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ab49e8eb4 | |||
|
4574dbf4ba |
18 changed files with 112 additions and 15 deletions
|
|
@ -24,7 +24,7 @@ jobs:
|
||||||
# work in our environmnet.
|
# work in our environmnet.
|
||||||
# Rather manually setup python (pip) before instead.
|
# Rather manually setup python (pip) before instead.
|
||||||
- name: Run ansible-lint
|
- name: Run ansible-lint
|
||||||
uses: https://github.com/ansible/ansible-lint@v26.3.0
|
uses: https://github.com/ansible/ansible-lint@v26.4.0
|
||||||
with:
|
with:
|
||||||
setup_python: "false"
|
setup_python: "false"
|
||||||
requirements_file: "requirements.yml"
|
requirements_file: "requirements.yml"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox
|
# renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox
|
||||||
netbox__version: "v4.5.5"
|
netbox__version: "v4.6.1"
|
||||||
netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}"
|
netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}"
|
||||||
netbox__custom_pipeline_oidc_group_and_role_mapping: true
|
netbox__custom_pipeline_oidc_group_and_role_mapping: true
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -291,3 +291,5 @@ msmtp_hosts:
|
||||||
renovate_hosts:
|
renovate_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
renovate:
|
renovate:
|
||||||
|
secrets_hosts:
|
||||||
|
hosts:
|
||||||
|
|
|
||||||
2
inventories/external/hosts.yaml
vendored
2
inventories/external/hosts.yaml
vendored
|
|
@ -22,3 +22,5 @@ infrastructure_authorized_keys_hosts:
|
||||||
ansible_pull_hosts:
|
ansible_pull_hosts:
|
||||||
hosts:
|
hosts:
|
||||||
status:
|
status:
|
||||||
|
secrets_hosts:
|
||||||
|
hosts:
|
||||||
|
|
|
||||||
|
|
@ -57,3 +57,5 @@ ansible_pull_hosts:
|
||||||
light:
|
light:
|
||||||
waybackproxy:
|
waybackproxy:
|
||||||
yate:
|
yate:
|
||||||
|
secrets_hosts:
|
||||||
|
hosts:
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,13 @@
|
||||||
tags:
|
tags:
|
||||||
- base_config
|
- base_config
|
||||||
|
|
||||||
|
- name: Ensure secrets deployment on secrets_hosts
|
||||||
|
hosts: secrets_hosts
|
||||||
|
roles:
|
||||||
|
- secrets
|
||||||
|
tags:
|
||||||
|
- secrets
|
||||||
|
|
||||||
- name: Ensure systemd-networkd config deployment on systemd_networkd_hosts
|
- name: Ensure systemd-networkd config deployment on systemd_networkd_hosts
|
||||||
hosts: systemd_networkd_hosts
|
hosts: systemd_networkd_hosts
|
||||||
roles:
|
roles:
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
services:
|
services:
|
||||||
oauth2-proxy:
|
oauth2-proxy:
|
||||||
container_name: oauth2-proxy
|
container_name: oauth2-proxy
|
||||||
image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.1
|
image: quay.io/oauth2-proxy/oauth2-proxy:v7.15.2
|
||||||
command: --config /oauth2-proxy.cfg
|
command: --config /oauth2-proxy.cfg
|
||||||
hostname: oauth2-proxy
|
hostname: oauth2-proxy
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
services:
|
services:
|
||||||
|
|
||||||
prometheus:
|
prometheus:
|
||||||
image: docker.io/prom/prometheus:v3.10.0
|
image: docker.io/prom/prometheus:v3.11.3
|
||||||
container_name: prometheus
|
container_name: prometheus
|
||||||
command:
|
command:
|
||||||
- '--config.file=/etc/prometheus/prometheus.yml'
|
- '--config.file=/etc/prometheus/prometheus.yml'
|
||||||
|
|
@ -19,7 +19,7 @@ services:
|
||||||
- prom_data:/prometheus
|
- prom_data:/prometheus
|
||||||
|
|
||||||
alertmanager:
|
alertmanager:
|
||||||
image: docker.io/prom/alertmanager:v0.31.1
|
image: docker.io/prom/alertmanager:v0.32.1
|
||||||
container_name: alertmanager
|
container_name: alertmanager
|
||||||
command:
|
command:
|
||||||
- '--config.file=/etc/alertmanager/alertmanager.yaml'
|
- '--config.file=/etc/alertmanager/alertmanager.yaml'
|
||||||
|
|
@ -46,7 +46,7 @@ services:
|
||||||
- graf_data:/var/lib/grafana
|
- graf_data:/var/lib/grafana
|
||||||
|
|
||||||
pve-exporter:
|
pve-exporter:
|
||||||
image: docker.io/prompve/prometheus-pve-exporter:3.8.2
|
image: docker.io/prompve/prometheus-pve-exporter:3.9.0
|
||||||
container_name: pve-exporter
|
container_name: pve-exporter
|
||||||
ports:
|
ports:
|
||||||
- 9221:9221
|
- 9221:9221
|
||||||
|
|
@ -59,7 +59,7 @@ services:
|
||||||
- /dev/null:/etc/prometheus/pve.yml
|
- /dev/null:/etc/prometheus/pve.yml
|
||||||
|
|
||||||
loki:
|
loki:
|
||||||
image: docker.io/grafana/loki:3.7.1
|
image: docker.io/grafana/loki:3.7.2
|
||||||
container_name: loki
|
container_name: loki
|
||||||
ports:
|
ports:
|
||||||
- 13100:3100
|
- 13100:3100
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
keycloak:
|
keycloak:
|
||||||
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.5.7
|
image: git.hamburg.ccc.de/ccchh/oci-images/keycloak:26.6.0
|
||||||
pull_policy: always
|
pull_policy: always
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: start --optimized
|
command: start --optimized
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
ntfy:
|
ntfy:
|
||||||
image: docker.io/binwiederhier/ntfy:v2.20.1
|
image: docker.io/binwiederhier/ntfy:v2.23.0
|
||||||
container_name: ntfy
|
container_name: ntfy
|
||||||
command:
|
command:
|
||||||
- serve
|
- serve
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
onlyoffice:
|
onlyoffice:
|
||||||
image: docker.io/onlyoffice/documentserver:9.3.1
|
image: docker.io/onlyoffice/documentserver:9.4.0
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- "./onlyoffice/DocumentServer/logs:/var/log/onlyoffice"
|
- "./onlyoffice/DocumentServer/logs:/var/log/onlyoffice"
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ services:
|
||||||
- pretalx_net
|
- pretalx_net
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: docker.io/library/redis:8.6.2
|
image: docker.io/library/redis:8.6.3
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- redis:/data
|
- redis:/data
|
||||||
|
|
@ -23,7 +23,7 @@ services:
|
||||||
- pretalx_net
|
- pretalx_net
|
||||||
|
|
||||||
static:
|
static:
|
||||||
image: docker.io/library/nginx:1.29.7
|
image: docker.io/library/nginx:1.31.1
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- public:/usr/share/nginx/html
|
- public:/usr/share/nginx/html
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: docker.io/library/redis:8.6.2
|
image: docker.io/library/redis:8.6.3
|
||||||
ports:
|
ports:
|
||||||
- "6379:6379"
|
- "6379:6379"
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
services:
|
services:
|
||||||
database:
|
database:
|
||||||
image: docker.io/library/postgres:18.3
|
image: docker.io/library/postgres:18.4
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- ./database:/var/lib/postgresql
|
- ./database:/var/lib/postgresql
|
||||||
|
|
@ -16,7 +16,7 @@ services:
|
||||||
- gatus
|
- gatus
|
||||||
|
|
||||||
gatus:
|
gatus:
|
||||||
image: ghcr.io/twin/gatus:v5.35.0
|
image: ghcr.io/twin/gatus:v5.36.0
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
|
|
|
||||||
24
roles/secrets/README.md
Normal file
24
roles/secrets/README.md
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
# Role `secrets`
|
||||||
|
|
||||||
|
Allows storing the given secret contents in the configured files.
|
||||||
|
|
||||||
|
## Supported Distributions
|
||||||
|
|
||||||
|
Should work on Debian-based distributions.
|
||||||
|
|
||||||
|
## Required Arguments
|
||||||
|
|
||||||
|
None.
|
||||||
|
|
||||||
|
## Optional Arguments
|
||||||
|
|
||||||
|
- `secrets__secrets`: List of secrets.
|
||||||
|
Defaults to the empty list (`[ ]`).
|
||||||
|
- `secrets__secrets.*.name`: (File)name for the secret (in the `/etc/ansible_secrets` directory).
|
||||||
|
- `secrets__secrets.*.content`: The secret content to store.
|
||||||
|
- `secrets__secrets.*.owner`: The owner of the secret file.
|
||||||
|
Defaults to `root`.
|
||||||
|
- `secrets__secrets.*.group`: The group of the secret file.
|
||||||
|
Defaults to `root`.
|
||||||
|
- `secrets__secrets.*.mode`: The mode of the secret file.
|
||||||
|
Defaults to `0640`.
|
||||||
1
roles/secrets/defaults/main.yaml
Normal file
1
roles/secrets/defaults/main.yaml
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
secrets__secrets: [ ]
|
||||||
6
roles/secrets/meta/argument_specs.yaml
Normal file
6
roles/secrets/meta/argument_specs.yaml
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
argument_specs:
|
||||||
|
main:
|
||||||
|
options:
|
||||||
|
secrets__secrets:
|
||||||
|
type: list
|
||||||
|
required: false
|
||||||
53
roles/secrets/tasks/main.yaml
Normal file
53
roles/secrets/tasks/main.yaml
Normal file
|
|
@ -0,0 +1,53 @@
|
||||||
|
- name: validate secret configs
|
||||||
|
ansible.builtin.validate_argument_spec:
|
||||||
|
argument_spec: "{{ required_data }}"
|
||||||
|
provided_arguments:
|
||||||
|
config: "{{ item }}"
|
||||||
|
loop: "{{ secrets__secrets }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.name }}"
|
||||||
|
vars:
|
||||||
|
required_data:
|
||||||
|
config:
|
||||||
|
type: dict
|
||||||
|
required: true
|
||||||
|
options:
|
||||||
|
name:
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
content:
|
||||||
|
type: str
|
||||||
|
required: true
|
||||||
|
owner:
|
||||||
|
type: str
|
||||||
|
required: false
|
||||||
|
default: root
|
||||||
|
group:
|
||||||
|
type: str
|
||||||
|
required: false
|
||||||
|
default: root
|
||||||
|
mode:
|
||||||
|
type: str
|
||||||
|
required: false
|
||||||
|
default: "0640"
|
||||||
|
|
||||||
|
- name: ensure secrets directory exists
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: "/etc/ansible_secrets"
|
||||||
|
state: directory
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: "0750"
|
||||||
|
become: true
|
||||||
|
|
||||||
|
- name: ensure secrets are present
|
||||||
|
ansible.builtin.copy:
|
||||||
|
content: "{{ item.content }}"
|
||||||
|
dest: "/etc/ansible_secrets/{{ item.name }}"
|
||||||
|
mode: "{{ item.mode | default('0640') }}"
|
||||||
|
owner: "{{ item.owner | default('root') }}"
|
||||||
|
group: "{{ item.group | default('root') }}"
|
||||||
|
become: true
|
||||||
|
loop: "{{ secrets__secrets }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.name }}"
|
||||||
Loading…
Add table
Add a link
Reference in a new issue