Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions ansible/roles/sasl/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
# BEGIN temporary tasks. Can be removed after initial deploy.
- name: Remove Postfix from SASL group
command: "gpasswd -d postfix sasl"
register: command_result
changed_when: "not 'is not a member of' in command_result.stderr"
register: sasl_postfix_command_result
changed_when: "not 'is not a member of' in sasl_postfix_command_result.stderr"
failed_when: false
tags:
- role::sasl
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/wireguard/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@
- name: Fetch private key for all hosts
slurp:
src: /etc/wireguard/key.priv
register: wg_priv_key
register: wireguard_priv_key
tags:
- role::wireguard

- name: Fetch public key for all hosts
slurp:
src: /etc/wireguard/key.pub
register: wg_pub_key
register: wireguard_pub_key
tags:
- role::wireguard

Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/wireguard/templates/wg0.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[Interface]
Address = {{ wireguard_subnet }}
ListenPort = {{ wireguard_port }}
PrivateKey = {{ wg_priv_key['content'] | b64decode | trim }}
PrivateKey = {{ wireguard_priv_key['content'] | b64decode | trim }}

PostUp = ip route add local {{ wireguard_subnet }} dev eth0
PreDown = ip route del local {{ wireguard_subnet }} dev eth0
Expand All @@ -11,7 +11,7 @@ PreDown = ip route del local {{ wireguard_subnet }} dev eth0
# Peer config for: {{ host }}
[Peer]
AllowedIPs = {{ hostvars[host]['wireguard_subnet'] }}
PublicKey = {{ hostvars[host]['wg_pub_key']['content'] | b64decode | trim }}
PublicKey = {{ hostvars[host]['wireguard_pub_key']['content'] | b64decode | trim }}
Endpoint = {{ host }}.box.pydis.wtf:{{ wireguard_port }}
PersistentKeepalive = 30

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies = [
[dependency-groups]
ansible = [
"ansible-core>=2.17.0,<3",
"ansible-lint==25.2.1 ; platform_system != 'Windows'",
"ansible-lint==26.4.0 ; platform_system != 'Windows'",
"dnspython==2.7.0",
]
dns = [
Expand Down
Loading
Loading