From dfc14816281e565251dfb215a5cc5cd6b48ede0d Mon Sep 17 00:00:00 2001 From: William Date: Wed, 26 Jul 2023 17:59:03 -0300 Subject: [PATCH] drop podsync --- flake.lock | 57 ++++++++++++++++++++++++- flake.nix | 8 +++- hosts/servers/alexandria/default.nix | 1 - hosts/servers/alexandria/podsync.nix | 20 --------- hosts/servers/alexandria/variables.nix | 1 - secrets/podsync.toml.age | Bin 3517 -> 0 bytes secrets/secrets.nix | 1 - 7 files changed, 63 insertions(+), 25 deletions(-) delete mode 100644 hosts/servers/alexandria/podsync.nix delete mode 100644 secrets/podsync.toml.age diff --git a/flake.lock b/flake.lock index 27349b2..6c28b5e 100644 --- a/flake.lock +++ b/flake.lock @@ -184,6 +184,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -444,7 +462,8 @@ "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks", + "yousable": "yousable" } }, "systems": { @@ -477,6 +496,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, @@ -491,6 +525,27 @@ "repo": "flake-utils", "type": "github" } + }, + "yousable": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1689940068, + "narHash": "sha256-GBzYvmmAntjUREwjtbLvubFXpcq49qjcgA+jaXUWc4M=", + "owner": "t184256", + "repo": "yousable", + "rev": "1c984eeba11aa9ccfbb797d53e693ee3c252523d", + "type": "github" + }, + "original": { + "owner": "t184256", + "repo": "yousable", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 29a404c..c8fcbda 100644 --- a/flake.nix +++ b/flake.nix @@ -51,11 +51,16 @@ url = "github:Infinidoge/nix-minecraft"; inputs.nixpkgs.follows = "nixpkgs"; }; + + yousable = { + url = "github:t184256/yousable"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs@{ self, nixpkgs, home-manager, baduhai-nur, kmonad , nixpkgs-stable, deploy-rs, agenix, nixos-generators, homepage, dotfiles - , pre-commit-hooks, nix-minecraft, ... }: { + , pre-commit-hooks, nix-minecraft, yousable, ... }: { nixosConfigurations = { rotterdam = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -91,6 +96,7 @@ modules = [ ./hosts/servers/alexandria.nix agenix.nixosModules.default + yousable.nixosModules.default self.nixosModules.qbittorrent ({ config, pkgs, ... }: let diff --git a/hosts/servers/alexandria/default.nix b/hosts/servers/alexandria/default.nix index 5ce2d65..808c15e 100644 --- a/hosts/servers/alexandria/default.nix +++ b/hosts/servers/alexandria/default.nix @@ -17,7 +17,6 @@ ./security.nix ./services.nix ./pairdrop.nix - ./podsync.nix ./users.nix ./variables.nix ./vaultwarden.nix diff --git a/hosts/servers/alexandria/podsync.nix b/hosts/servers/alexandria/podsync.nix deleted file mode 100644 index a63d150..0000000 --- a/hosts/servers/alexandria/podsync.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ inputs, config, pkgs, lib, ... }: - -{ - virtualisation.oci-containers.containers."podsync" = { - image = "docker.io/mxpv/podsync:latest"; - environment = { TZ = "America/Bahia"; }; - ports = [ "${config.ports.podsync}:80" ]; - volumes = [ "${config.age.secrets."podsync.toml".path}:/app/config.toml" ]; - extraOptions = [ "--label=io.containers.autoupdate=registry" ]; - }; - - services.nginx.virtualHosts."podsync.baduhai.me" = { - useACMEHost = "baduhai.me"; - forceSSL = true; - kTLS = true; - locations."/".proxyPass = "http://127.0.0.1:${config.ports.podsync}"; - }; - - age.secrets."podsync.toml".file = ../../../secrets/podsync.toml.age; -} diff --git a/hosts/servers/alexandria/variables.nix b/hosts/servers/alexandria/variables.nix index ce509f1..61d0050 100644 --- a/hosts/servers/alexandria/variables.nix +++ b/hosts/servers/alexandria/variables.nix @@ -16,7 +16,6 @@ in { cinny = mkStringOption "8002"; librespeed = mkStringOption "8003"; paperless = mkStringOption "8004"; - podsync = mkStringOption "8005"; cinny2 = mkStringOption "8006"; searx = mkStringOption "8007"; qbittorrent = mkStringOption "8008"; diff --git a/secrets/podsync.toml.age b/secrets/podsync.toml.age deleted file mode 100644 index 2bbce21a2492ddb3de7d8f25e05e072b04c30325..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3517 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