From 3b207db75246b43a10ffd7305ce1d245abb15276 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Wed, 13 Dec 2023 17:51:04 +0100 Subject: [PATCH] fix dhcp lease to unbount, git runner and openconnect keepalive --- hosts/fw.cloonar.com/modules/gitea.nix | 3 +++ .../modules/home-assistant/light.nix | 2 +- hosts/fw.cloonar.com/modules/openconnect.nix | 18 ++++++++++++++++++ hosts/fw.cloonar.com/modules/unbound.nix | 9 +++++---- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/hosts/fw.cloonar.com/modules/gitea.nix b/hosts/fw.cloonar.com/modules/gitea.nix index 3f560f5..e3981ff 100644 --- a/hosts/fw.cloonar.com/modules/gitea.nix +++ b/hosts/fw.cloonar.com/modules/gitea.nix @@ -100,6 +100,9 @@ in }; }; + + sops.secrets.gitea-runner-token = { }; + services.gitea-actions-runner.instances.main = { enable = true; url = "https://git.cloonar.com"; diff --git a/hosts/fw.cloonar.com/modules/home-assistant/light.nix b/hosts/fw.cloonar.com/modules/home-assistant/light.nix index 269a41b..02416ab 100644 --- a/hosts/fw.cloonar.com/modules/home-assistant/light.nix +++ b/hosts/fw.cloonar.com/modules/home-assistant/light.nix @@ -59,7 +59,7 @@ "light.kitchen_lights" "light.livingroom_lights" "light.hallway_lights" - "light.bathroom_light" + "light.bathroom_lights" "light.toilett_lights" "light.storage_lights" ]; diff --git a/hosts/fw.cloonar.com/modules/openconnect.nix b/hosts/fw.cloonar.com/modules/openconnect.nix index d7bd71f..e56f344 100644 --- a/hosts/fw.cloonar.com/modules/openconnect.nix +++ b/hosts/fw.cloonar.com/modules/openconnect.nix @@ -19,4 +19,22 @@ in }; }; }; + + + systemd.services.openconnect-wrwks-keepalive = { + serviceConfig.Type = "oneshot"; + path = with pkgs; [ bash ]; + script = '' + ping -c 2 stage.wsw.at + ''; + }; + + systemd.timers.openconnect-wrwks-keepalive = { + wantedBy = [ "timers.target" ]; + partOf = [ "openconnect-wrwks-keepalive.service" ]; + timerConfig = { + OnCalendar = "*:0/1"; + Unit = "openconnect-wrwks-keepalive.service"; + }; + }; } diff --git a/hosts/fw.cloonar.com/modules/unbound.nix b/hosts/fw.cloonar.com/modules/unbound.nix index a07860c..893a35f 100644 --- a/hosts/fw.cloonar.com/modules/unbound.nix +++ b/hosts/fw.cloonar.com/modules/unbound.nix @@ -148,8 +148,8 @@ in { hostPath = "${config.security.acme.certs.${domain}.directory}"; isReadOnly = true; }; - "/var/lib/kea/dhcp4.leases" = { - hostPath = "/var/lib/kea/dhcp4.leases"; + "/var/lib/kea" = { + hostPath = "/var/lib/kea"; isReadOnly = true; }; }; @@ -220,9 +220,10 @@ in { } function syncFile() { - readFileUnique "''\$1" "''\$2" - while inotifywait -e close_write,create "''\$1" ; do + # readFileUnique "''\$1" "''\$2" + while true; do readFileUnique "''\$1" "''\$2" + sleep 10 done }