From 315a8655eaf82cad1a0d934fd251f8c6671c370a Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Mon, 10 Feb 2025 16:13:59 +0100
Subject: [PATCH] Update configs
Use temporary next image for woodpecker
Restrict SPF in mail
Fix factorio IP
---
dns/default_records.js | 1 +
dnsconfig.js | 1 +
playbooks/roles/woodpecker/vars/main.yml | 4 ++--
services.auto.tfvars | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dns/default_records.js b/dns/default_records.js
index e2af7b0..f9cf54b 100644
--- a/dns/default_records.js
+++ b/dns/default_records.js
@@ -5,6 +5,7 @@ function mx_default(dkim) {
CNAME("autodiscover", "mail.serguzim.me."),
SRV("_autodiscover._tcp", 1, 1, 443, "mail.serguzim.me."),
+ TXT("*", "v=spf1 -all"),
TXT("@", "v=spf1 mx -all"),
TXT("mail-ses", "v=spf1 include:amazonses.com -all"),
diff --git a/dnsconfig.js b/dnsconfig.js
index 245546b..427fc85 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -59,6 +59,7 @@ D("msrg.cc", REG_OVH, DnsProvider(DSP_OVH),
// |___/
D("serguzim.me", REG_OVH, DnsProvider(DSP_OVH),
all_defaults("serguzim.me", true),
+ TXT("direct", "v=spf1 mx -all"),
TLSA("_25._tcp.mail", 3, 1, 1, "e66a608a3ec459bda7fb1f2d500b8abeb78f2910f26641204b6bc454b8aa2a49"),
diff --git a/playbooks/roles/woodpecker/vars/main.yml b/playbooks/roles/woodpecker/vars/main.yml
index 81653ca..7fa61a5 100644
--- a/playbooks/roles/woodpecker/vars/main.yml
+++ b/playbooks/roles/woodpecker/vars/main.yml
@@ -33,11 +33,11 @@ woodpecker_env:
woodpecker_compose:
watchtower: update
- image: woodpeckerci/woodpecker-server
+ image: woodpeckerci/woodpecker-server:next
file:
services:
agent:
- image: woodpeckerci/woodpecker-agent:latest
+ image: woodpeckerci/woodpecker-agent:next
restart: always
labels:
com.centurylinklabs.watchtower.enable: true
diff --git a/services.auto.tfvars b/services.auto.tfvars
index c71a035..0b21e39 100644
--- a/services.auto.tfvars
+++ b/services.auto.tfvars
@@ -138,7 +138,7 @@ services = {
type = "docker"
}]
monitoring = {
- url = "https://multiplayer.factorio.com/get-game-details/49.13.212.188:34197"
+ url = "https://multiplayer.factorio.com/get-game-details/91.107.211.57:34197"
group = "4-services"
interval = "5m"
conditions = [