From c952579d1303558685c61cec1b688716f383bfd0 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 10 Apr 2026 20:22:37 +0300 Subject: add ema --- f3s/argocd-apps/services/pihole.yaml | 32 ++++++++++++++++++-------------- frontends/Rexfile | 8 ++++++-- frontends/etc/mail/virtualusers | 1 + 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/f3s/argocd-apps/services/pihole.yaml b/f3s/argocd-apps/services/pihole.yaml index 18e48fa..a22e585 100644 --- a/f3s/argocd-apps/services/pihole.yaml +++ b/f3s/argocd-apps/services/pihole.yaml @@ -3,8 +3,11 @@ kind: Application metadata: name: pihole namespace: cicd - finalizers: - - resources-finalizer.argocd.argoproj.io + annotations: + argocd.argoproj.io/compare-options: Disabled + # finalizers removed so ArgoCD won't block deletion + # finalizers: + # - resources-finalizer.argocd.argoproj.io spec: project: default sources: @@ -46,15 +49,16 @@ spec: destination: server: https://kubernetes.default.svc namespace: services - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - CreateNamespace=false - retry: - limit: 3 - backoff: - duration: 5s - factor: 2 - maxDuration: 1m + # syncPolicy disabled - pihole moved to Raspberry Pis + # syncPolicy: + # automated: + # prune: true + # selfHeal: true + # syncOptions: + # - CreateNamespace=false + # retry: + # limit: 3 + # backoff: + # duration: 5s + # factor: 2 + # maxDuration: 1m diff --git a/frontends/Rexfile b/frontends/Rexfile index cf22486..7407f90 100644 --- a/frontends/Rexfile +++ b/frontends/Rexfile @@ -108,6 +108,8 @@ our %wg0_ips = ( 'r0' => { '4' => '192.168.2.120', '6' => 'fd42:beef:cafe:2::120' }, 'r1' => { '4' => '192.168.2.121', '6' => 'fd42:beef:cafe:2::121' }, 'r2' => { '4' => '192.168.2.122', '6' => 'fd42:beef:cafe:2::122' }, + 'pi0' => { '4' => '192.168.2.203', '6' => 'fd42:beef:cafe:2::203' }, + 'pi1' => { '4' => '192.168.2.204', '6' => 'fd42:beef:cafe:2::204' }, ); # UTILITY TASKS @@ -553,8 +555,10 @@ task 'gogios', my $gogios_path = '/usr/local/bin/gogios'; - # Ensure gogios is installed from the package repo - run_task 'gogios_install'; + # Ensure gogios is installed from the package repo. + # Must pass on => connection->server so Rex runs the sub-task on the + # remote host instead of falling back to localhost (Linux). + run_task 'gogios_install', on => connection->server; run 'adduser -group _gogios -batch _gogios', unless => 'id _gogios'; run 'usermod -d /var/run/gogios _gogios'; diff --git a/frontends/etc/mail/virtualusers b/frontends/etc/mail/virtualusers index 6cfac58..dfe903c 100644 --- a/frontends/etc/mail/virtualusers +++ b/frontends/etc/mail/virtualusers @@ -2,4 +2,5 @@ albena@buetow.org albena.buetow@protonmail.com joern@buetow.org df2hbradio@gmail.com dory@buetow.org df2hbradio@gmail.com ecat@buetow.org df2hbradio@gmail.com +ema@buetow.org paul.buetow@protonmail.com @ paul.buetow@protonmail.com -- cgit v1.2.3