From 4a9a48505a81aaac0c061e9663311080ed283c27 Mon Sep 17 00:00:00 2001 From: notohh Date: Fri, 5 Jan 2024 14:43:55 -0500 Subject: [PATCH] hosts: move attic back to sora --- hosts/default.nix | 2 +- hosts/kaze/services/default.nix | 1 - hosts/{kaze => sora}/services/attic.nix | 0 hosts/sora/services/default.nix | 3 ++- hosts/sora/services/traefik.nix | 2 +- hosts/tsuki/services/atticd.nix | 18 ++++++++++++++++++ hosts/tsuki/services/default.nix | 1 + 7 files changed, 23 insertions(+), 4 deletions(-) rename hosts/{kaze => sora}/services/attic.nix (100%) create mode 100644 hosts/tsuki/services/atticd.nix diff --git a/hosts/default.nix b/hosts/default.nix index ef76da0..d705a04 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -141,6 +141,7 @@ in { modules = [ ./sora sopsModule + atticModule hmModule { home-manager = { @@ -201,7 +202,6 @@ in { modules = [ ./kaze sopsModule - atticModule hmModule { home-manager = { diff --git a/hosts/kaze/services/default.nix b/hosts/kaze/services/default.nix index 6f36a53..50199ae 100644 --- a/hosts/kaze/services/default.nix +++ b/hosts/kaze/services/default.nix @@ -2,6 +2,5 @@ _: { imports = [ ./tailscale.nix ./minio.nix - ./attic.nix ]; } diff --git a/hosts/kaze/services/attic.nix b/hosts/sora/services/attic.nix similarity index 100% rename from hosts/kaze/services/attic.nix rename to hosts/sora/services/attic.nix diff --git a/hosts/sora/services/default.nix b/hosts/sora/services/default.nix index 314e881..afb312b 100644 --- a/hosts/sora/services/default.nix +++ b/hosts/sora/services/default.nix @@ -4,8 +4,9 @@ ./traefik.nix ./uptimekuma.nix ./ntfy-sh.nix + ./attic.nix ./tailscale.nix - ./factorio.nix + # ./factorio.nix # ./minecraft.nix # ./foundryvtt.nix ]; diff --git a/hosts/sora/services/traefik.nix b/hosts/sora/services/traefik.nix index 5d4b639..3db6187 100644 --- a/hosts/sora/services/traefik.nix +++ b/hosts/sora/services/traefik.nix @@ -171,7 +171,7 @@ neko.loadBalancer.servers = [{url = "http://100.104.42.96:8085";}]; justlog.loadBalancer.servers = [{url = "http://100.121.201.47:8025";}]; ntfy-sh.loadBalancer.servers = [{url = "http://100.104.42.96:8090";}]; - attic.loadBalancer.servers = [{url = "http://100.69.79.81:8200";}]; + attic.loadBalancer.servers = [{url = "http://100.104.42.96:8200";}]; minio.loadBalancer.servers = [{url = "http://100.69.79.81:9005";}]; }; }; diff --git a/hosts/tsuki/services/atticd.nix b/hosts/tsuki/services/atticd.nix new file mode 100644 index 0000000..8fcc64b --- /dev/null +++ b/hosts/tsuki/services/atticd.nix @@ -0,0 +1,18 @@ +{pkgs, ...}: { + environment.systemPackages = [pkgs.attic]; + + systemd.services.atticd = { + enable = true; + wantedBy = [ + "multi-user.target" + ]; + description = "atticd"; + + serviceConfig = { + User = "notoh"; + ExecStart = "${pkgs.attic}/bin/attic watch-store kyasshu"; + Restart = "always"; + RestartSec = 30; + }; + }; +} diff --git a/hosts/tsuki/services/default.nix b/hosts/tsuki/services/default.nix index db1958c..4cdded0 100644 --- a/hosts/tsuki/services/default.nix +++ b/hosts/tsuki/services/default.nix @@ -1,5 +1,6 @@ {...}: { imports = [ + ./atticd.nix ./restic.nix ./hydroxide.nix ];