diff --git a/globals.nix b/globals.nix index 33699e1..38146d1 100644 --- a/globals.nix +++ b/globals.nix @@ -44,7 +44,7 @@ _: { inbucketIPv4 = "192.168.30.130"; piholeIPv4 = "192.168.30.131"; gitIPv4 = "192.168.30.132"; - transmissionIPv4 = "192.168.30.133"; + delugeIPv4 = "192.168.30.133"; bind9IPv4 = "192.168.30.134"; dnsmasqIPv4 = "192.168.30.135"; minecraftIPv4 = "192.168.30.136"; diff --git a/modules/bootstrap-default.nix b/modules/bootstrap-default.nix index 984ff4e..862c1eb 100644 --- a/modules/bootstrap-default.nix +++ b/modules/bootstrap-default.nix @@ -93,21 +93,17 @@ hedgedoc-uploads.storage = "50Mi"; hedgedoc-db.storage = "100Mi"; kitchenowl.storage = "100Mi"; - forgejo.storage = "20Gi"; paperless-data.storage = "10Gi"; paperless-redisdata.storage = "20Mi"; paperless-db.storage = "150Mi"; - syncthing.storage = "400Mi"; pihole-data.storage = "750Mi"; pihole-dnsmasq.storage = "16Mi"; immich.storage = "50Gi"; immich-db.storage = "5Gi"; attic.storage = "15Gi"; attic-db.storage = "150Mi"; - transmission.storage = "25Mi"; minecraft.storage = "1Gi"; ntfy.storage = "300Mi"; - keepassxc.storage = "100Mi"; authentik-db.storage = "10Gi"; authentik-redis.storage = "5Gi"; mealie.storage = "3Gi"; diff --git a/modules/media.nix b/modules/media.nix index 02de173..ed42cee 100644 --- a/modules/media.nix +++ b/modules/media.nix @@ -481,7 +481,7 @@ in { deluge = lib.mkIf cfg.deluge.enable { spec = { type = "LoadBalancer"; - loadBalancerIP = globals.transmissionIPv4; + loadBalancerIP = globals.delugeIPv4; selector = { app = "media"; diff --git a/modules/syncthing.nix b/modules/syncthing.nix index 31bde21..6aeb3f0 100644 --- a/modules/syncthing.nix +++ b/modules/syncthing.nix @@ -8,8 +8,6 @@ config = lib.mkIf config.syncthing.enable { kubernetes.resources = { - serviceAccounts.syncthing = {}; - deployments.syncthing.spec = { selector.matchLabels.app = "syncthing"; @@ -26,7 +24,7 @@ metadata.labels.app = "syncthing"; spec = { - serviceAccountName = "syncthing"; + nodeName = "jefke"; containers.syncthing = { image = globals.images.syncthing; @@ -52,8 +50,15 @@ }; volumes = { - config.persistentVolumeClaim.claimName = "config"; - keepassxc.persistentVolumeClaim.claimName = "keepassxc"; + keepassxc.hostPath = { + path = "/mnt/longhorn/persistent/volumes/keepassxc"; + type = "Directory"; + }; + + config.hostPath = { + path = "/mnt/longhorn/persistent/volumes/syncthing"; + type = "Directory"; + }; }; securityContext = { @@ -77,18 +82,6 @@ }; lab = { - longhorn.persistentVolumeClaim = { - config = { - volumeName = "syncthing"; - storage = "400Mi"; - }; - - keepassxc = { - volumeName = "keepassxc"; - storage = "100Mi"; - }; - }; - tailscaleIngresses.tailscale = { host = "syncthing"; service.name = "syncthing";