Compare commits
2 commits
bfb0defc3c
...
1044492b9d
| Author | SHA1 | Date | |
|---|---|---|---|
| 1044492b9d | |||
|
d514688574 |
9 changed files with 31 additions and 7 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
systemd_networkd__config_dir: 'resources/chaosknoten/router/systemd_networkd/'
|
systemd_networkd__config_dir: 'resources/chaosknoten/router/systemd_networkd/'
|
||||||
|
systemd_networkd__global_config: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/router/systemd_networkd_global_config.conf') }}"
|
||||||
nftables__config: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/router/nftables/nftables.conf') }}"
|
nftables__config: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/router/nftables/nftables.conf') }}"
|
||||||
ansible_pull__timer_on_calendar: "*-*-* 04:00:00 Europe/Berlin"
|
ansible_pull__timer_on_calendar: "*-*-* 04:00:00 Europe/Berlin"
|
||||||
ansible_pull__timer_randomized_delay_sec: 0min
|
ansible_pull__timer_randomized_delay_sec: 0min
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ services:
|
||||||
- prom_data:/prometheus
|
- prom_data:/prometheus
|
||||||
|
|
||||||
alertmanager:
|
alertmanager:
|
||||||
image: docker.io/prom/alertmanager:v0.30.0
|
image: docker.io/prom/alertmanager:v0.30.1
|
||||||
container_name: alertmanager
|
container_name: alertmanager
|
||||||
command:
|
command:
|
||||||
- '--config.file=/etc/alertmanager/alertmanager.yaml'
|
- '--config.file=/etc/alertmanager/alertmanager.yaml'
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ services:
|
||||||
- pretalx_net
|
- pretalx_net
|
||||||
|
|
||||||
pretalx:
|
pretalx:
|
||||||
image: docker.io/pretalx/standalone:v2025.1.0
|
image: docker.io/pretalx/standalone:v2025.2.2
|
||||||
entrypoint: gunicorn
|
entrypoint: gunicorn
|
||||||
command:
|
command:
|
||||||
- "pretalx.wsgi"
|
- "pretalx.wsgi"
|
||||||
|
|
@ -78,7 +78,7 @@ services:
|
||||||
- pretalx_net
|
- pretalx_net
|
||||||
|
|
||||||
celery:
|
celery:
|
||||||
image: docker.io/pretalx/standalone:v2025.1.0
|
image: docker.io/pretalx/standalone:v2025.2.2
|
||||||
command:
|
command:
|
||||||
- taskworker
|
- taskworker
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ Name=net1
|
||||||
|
|
||||||
[Network]
|
[Network]
|
||||||
DNS=212.12.50.158
|
DNS=212.12.50.158
|
||||||
IPForward=ipv4
|
|
||||||
IPv6AcceptRA=no
|
IPv6AcceptRA=no
|
||||||
|
|
||||||
[Address]
|
[Address]
|
||||||
|
|
@ -11,4 +10,3 @@ Address=212.12.48.123/24
|
||||||
|
|
||||||
[Route]
|
[Route]
|
||||||
Gateway=212.12.48.55
|
Gateway=212.12.48.55
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ Name=net2
|
||||||
|
|
||||||
[Network]
|
[Network]
|
||||||
#DNS=212.12.50.158
|
#DNS=212.12.50.158
|
||||||
IPForward=ipv6
|
|
||||||
IPv6AcceptRA=no
|
IPv6AcceptRA=no
|
||||||
|
|
||||||
[Address]
|
[Address]
|
||||||
|
|
@ -11,4 +10,3 @@ Address=2a00:14b0:4200:3500::130:2/112
|
||||||
|
|
||||||
[Route]
|
[Route]
|
||||||
Gateway=2a00:14b0:4200:3500::130:1
|
Gateway=2a00:14b0:4200:3500::130:1
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
[Network]
|
||||||
|
IPv4Forwarding=true
|
||||||
|
IPv6Forwarding=true
|
||||||
|
|
@ -9,3 +9,8 @@ Should work on Debian-based distributions.
|
||||||
## Required Arguments
|
## Required Arguments
|
||||||
|
|
||||||
- `systemd_networkd__config_dir`: Directory with systemd-networkd configs to deploy.
|
- `systemd_networkd__config_dir`: Directory with systemd-networkd configs to deploy.
|
||||||
|
|
||||||
|
## Optional Arguments
|
||||||
|
|
||||||
|
- `systemd_networkd__global_config`: systemd-networkd global configuration to deploy (see `man 5 networkd.conf`).
|
||||||
|
Defaults to `` (the empty string);
|
||||||
|
|
|
||||||
1
roles/systemd_networkd/defaults/main.yaml
Normal file
1
roles/systemd_networkd/defaults/main.yaml
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
systemd_networkd__global_config: ""
|
||||||
|
|
@ -12,3 +12,21 @@
|
||||||
recursive: true
|
recursive: true
|
||||||
delete: true
|
delete: true
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
|
- name: ensure global systemd-networkd config directory exists
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: "/etc/systemd/networkd.conf.d"
|
||||||
|
state: directory
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: "0755"
|
||||||
|
become: true
|
||||||
|
|
||||||
|
- name: ensure global systemd-networkd config is deployed
|
||||||
|
ansible.builtin.copy:
|
||||||
|
content: "{{ systemd_networkd__global_config }}"
|
||||||
|
dest: "/etc/systemd/networkd.conf.d/20-ansible.conf"
|
||||||
|
mode: "0644"
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
become: true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue