From 9e2fe26517619d63df983ad0557c6554d2c6f280 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 17 Mar 2024 10:04:05 +0100
Subject: sync-containers3: add hostname option

---
 krebs/3modules/sync-containers3.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/sync-containers3.nix b/krebs/3modules/sync-containers3.nix
index 7373592a5..ed72ca30c 100644
--- a/krebs/3modules/sync-containers3.nix
+++ b/krebs/3modules/sync-containers3.nix
@@ -43,6 +43,14 @@ in {
               fi
             '';
           };
+          hostname = lib.mkOption {
+            type = lib.types.str;
+            description = ''
+              hostname of the container,
+              his is continously checked by ping and the container is restarted if unreachable
+            '';
+            default = config.name;
+          };
         };
       }));
     };
@@ -110,8 +118,8 @@ in {
               set -efux
               consul lock sync_${ctr.name} ${pkgs.writers.writeDash "${ctr.name}-sync" ''
                 set -efux
-                if ping -c 1 ${ctr.name}.r; then
-                  nice --adjustment=30 rsync -a -e "ssh -i $CREDENTIALS_DIRECTORY/ssh_key" --timeout=30 --inplace --sparse container_sync@${ctr.name}.r:disk "$HOME"/disk.rsync
+                if ping -c 1 ${ctr.hostname}; then
+                  nice --adjustment=30 rsync -a -e "ssh -i $CREDENTIALS_DIRECTORY/ssh_key" --timeout=30 --inplace --sparse container_sync@${ctr.hostname}:disk "$HOME"/disk.rsync
                   touch "$HOME"/incomplete
                   nice --adjustment=30 rsync --inplace "$HOME"/disk.rsync "$HOME"/disk
                   rm -f "$HOME"/incomplete
@@ -153,7 +161,7 @@ in {
                     export payload
                     if [ "$(jq -rn 'env.payload | fromjson.host')" = '${config.networking.hostName}' ]; then
                       # echo 'we are the host, trying to reach container'
-                      if $(retry -t 10 -d 10 -- ping -q -c 1 ${ctr.name}.r > /dev/null); then
+                      if $(retry -t 10 -d 10 -- ping -q -c 1 ${ctr.hostname} > /dev/null); then
                         # echo 'container is reachable, continueing'
                         continue
                       else
@@ -237,8 +245,8 @@ in {
                 /run/current-system/sw/bin/nixos-container start ${ctr.name}
                 # wait for system to become reachable for the first time
                 systemctl start ${ctr.name}_watcher.service
-                retry -t 10 -d 10 -- ping -q -c 1 ${ctr.name}.r > /dev/null
-                while systemctl is-active container@${ctr.name}.service >/devnull && ping -q -c 3 ${ctr.name}.r >/dev/null; do
+                retry -t 10 -d 10 -- ping -q -c 1 ${ctr.hostname} > /dev/null
+                while systemctl is-active container@${ctr.name}.service >/devnull && ping -q -c 3 ${ctr.hostname} >/dev/null; do
                   consul kv put containers/${ctr.name} "$(jq -cn '{host: "${config.networking.hostName}", time: now}')" >/dev/null
                   sleep 10
                 done
-- 
cgit v1.2.3


From a89f923b1aa86a1fa6352d2dceb1bc8124a0ced7 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 17 Mar 2024 10:04:32 +0100
Subject: sync-containers3: get rid of stateVersion warning

---
 krebs/3modules/sync-containers3.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/sync-containers3.nix b/krebs/3modules/sync-containers3.nix
index ed72ca30c..12a5ee4e7 100644
--- a/krebs/3modules/sync-containers3.nix
+++ b/krebs/3modules/sync-containers3.nix
@@ -76,6 +76,8 @@ in {
             serviceConfig.ExecStart = pkgs.writers.writeDash "autoswitch" ctr.startCommand;
             unitConfig.X-StopOnRemoval = false;
           };
+          # get rid of stateVersion not set warning;
+          system.stateVersion = config.system.nixos.release;
         };
         autoStart = false;
         enableTun = true;
-- 
cgit v1.2.3


From 74cc0c4b638128a2bf3baeff620046edc50db2e3 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 17 Mar 2024 12:29:06 +0100
Subject: go: fix redis warning

---
 krebs/3modules/go.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/go.nix b/krebs/3modules/go.nix
index 9dc8fe6d2..0c3f42f1c 100644
--- a/krebs/3modules/go.nix
+++ b/krebs/3modules/go.nix
@@ -20,9 +20,7 @@ let
   };
 
   imp = {
-    services.redis = {
-      enable = true;
-    };
+    services.redis.servers.go.enable = true;
 
     krebs.htgen.go = {
       port = cfg.port;
-- 
cgit v1.2.3