From aa73269beee4442e19a726f79461289caecdb88b Mon Sep 17 00:00:00 2001 From: James Walker Date: Fri, 16 Dec 2022 18:44:26 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20aristotle:=20ipfs=20cluster=20ap?= =?UTF-8?q?i=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 24 ++++++++++++------------ secrets/secrets.yaml | 6 +++--- services/ipfs-cluster.nix | 4 +++- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index f826111..84147ef 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1671020882, - "narHash": "sha256-nilsez0cjzvWUZzcWI+ZK3gY/wT3RvkQA9qw8GYJmEU=", + "lastModified": 1671196037, + "narHash": "sha256-2+J98SeczFWonbqFLMEAQC7vZEe6I2gM17XYvEmG52I=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "2795e05cca69bddad989186888175548f4fca33d", + "rev": "adb8ac0453c8b2c40f5bffb578453dbaee838952", "type": "github" }, "original": { @@ -141,11 +141,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1670970889, - "narHash": "sha256-TWJo3/X3Q3r+HeX16QN4FE6ddBpGtAboymSEF+4Nnc0=", + "lastModified": 1671209729, + "narHash": "sha256-zxn1eA/rMi2DOx43V7q87bGaDzvL7CMVY/Ti7lJ92DQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "e412025fffdcd6219ddd21c65d9a1b90005ce508", + "rev": "7d55a72d4c1df694e87a41a7e6c9a7b6e9a40ca3", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1670959777, - "narHash": "sha256-9nQJWL7S77YZERxairPLFO6TUuF1RgQmdZO6dKRCHz4=", + "lastModified": 1671228065, + "narHash": "sha256-Az/ig9LVL5xdqtyl4/CVKJIH1G7sP/9Ott2XnNyie0E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0fbf27af51a7c9bc68a168fdcd63513c4f100b15", + "rev": "e462a4baf75eeac639b4942481759de08a3bc94e", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1671007632, - "narHash": "sha256-1uxNTBOa0SMypJKOWeUqrz2VfmwQ1hVgWckPdgDNip4=", + "lastModified": 1671190014, + "narHash": "sha256-NW385LW4Nj53Hbv3LXr458s4NL2/wcARC8rzK7vSWkw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b9a0cd40ede905f554399f3f165895dccfd35f3b", + "rev": "fbcb61bd7eb19914cbd88789c3586a63ff46b72b", "type": "github" }, "original": { diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index dc81181..950ef14 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,5 +1,5 @@ matrix-registration-secret: ENC[AES256_GCM,data:Sn3pGBq4U3Tgw0pYaetnBLRiNdFGnMxAxyfrxhF9kFDMFijKSy9XBj71M5XxV4shYQyPvu2WDnPR1YvyoQVlv8cEoXhX7++JlYsp/2ZfKIzp4iMxh24z57Cw8vg=,iv:/zxlIeI9gWWCHbejYgz8pjjOrukKome0/bmcXuG3/yE=,tag:3fc3c96H3pO1FUO7p3T4gw==,type:str] -ipfs-cluster-secret: ENC[AES256_GCM,data:Z9i7ZLhlXw4m8myNUSiY5ej2/6UIwCwIe0bvbCttVLdv8cAHwzR2f22poKD6KnPBe9yaym+X3YtrHTCM4pVIbiSzMsHwYZ00vRQi35ZmYg==,iv:9PBz/olzA4X7JEL1xG8ACUaH1WDHSzApzlG5q0ZqSYk=,tag:9I4PGf91MHAKNeG4fVKIow==,type:str] +ipfs-cluster-secret: ENC[AES256_GCM,data:5TBtLezO/O9LiIyqoeTQHf0j5wmArpnksgu5QiofqAPIMkbau9N5m9pjvaR2j+W0FAYO53Sl8ddBMBuiPuB31OzSgCbqAT/6ycZr2xdA7OJP3TciAR4piJ+GK19HJQV7N0u90kwulOGXjUk6WfPUgQeKTkf+Tg8kjoYrZxmSesFJXhm8mdjGd90b1toypZ6AGhegLD4i7keAA3X/bX1OeHFVF7bLaL/ufO2Czq5WK25v/51oCgjv0ushJcX4QnAvXQIg2XTsvONz4OzY,iv:amHmuy0bPCAs5sNJK1K0NgNYrXlsOfnhj17YpfNaukY=,tag:WsS/L36Vh55iMBbY+/3W7w==,type:str] drone: ENC[AES256_GCM,data:UKh2qyZq5eTiEpdbGve+fCQZzSx/j+wUv9eHT/ToU9b51rwA7XJQC4g3rvljBL9X7DFVVdsWOdG6y1eRGImdelJ5hwxa8oK5CBpaGLGjd9+Hm8SS+Q+PAFDW6fdsPtDDgK5jjykcIlJ7u9mjCffFsCGw3UWfHxnniCnIba9e499XU+VR6l96U3oGOsrr0XO/d2zwrOm3mvXQL1P3cE+se4/UDKrdABGfKWyGqZ9xgi6Q7PTSmRv4AtpwpgF1URBvPVqs6yoexWetksLv+Xk5H50EeucbMOA+oUSJ06fUMECFRF9thRrdUbtK,iv:CiZz6NSksNMGmZxWS7uE69O6UnvTkRWbeBwC1bUqR9o=,tag:qcLmseQgkjMVv2uNXPFHzw==,type:str] traefik: ENC[AES256_GCM,data:SEjgraDDpdJnaOEZVi/0Vtr3J/jQ3zC2kZaMmMRKhRd77EkXC6eeSbOaORv30QSXcfipm8INT45TKZfRSdbnoV6XbgAqLyLmef3LkmMt+eA=,iv:bbns12ZiqeBha0eWEARMixFfPDHzF8PBjUEeEdkwf6Q=,tag:ft2k2CQk7VmfWiGhhyHVfQ==,type:str] sops: @@ -62,8 +62,8 @@ sops: alB4LzZGSTJmUEt0TFBkUTdzR1pOOTQKG8T65JhLKx602YnEmG/Gqi/rY8X/9XgF 61ejhZ1DucTrM3sfUKjTFwaNVJLJgGEoPRioZW0SJkckjm5NNlutLw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2022-12-04T04:02:03Z" - mac: ENC[AES256_GCM,data:LceCSjhcE6XKS62XydiWq4JcaNYPjP7VU2EFtd1lAkS4vi4KiFgchBCmv8vqIHQLOoXLyI5RkZbn78z0M5FqA/Pc2ApEo/Wx4eHogmW+r3qojTTqrlpfS5ssXK3Svk8hppz1MpWGQOI8rMY1jEUYgkmqq6ClKDUc8+v59wNHHvY=,iv:XyQBSKekk5e5UDTVVWXtc/nyCmWTCKcAvl7QDXZOgmA=,tag:cGnc2ZqEJBQ8kiOqLX6kLw==,type:str] + lastmodified: "2022-12-16T23:36:07Z" + mac: ENC[AES256_GCM,data:YNiRvCUb2hx3HGYlpNNn6RFehl2LgSko9zuT0Ele8JBjB/J380yv2x9ZXtNQBSlM7cMrc48G5DYxWkeXf7y839FNHCbdgt20IjbU8jX5EPkDRdobLhBkIaZzaDRFFaBc4UnL+cgjHJjj86qJckccREwHsh2QCZ3G1ImeKy1AaAA=,iv:Z5LQSuuqwS/Hc5Zuyea3gITXG4ysctugkXU904B//Wk=,tag:Bspa62jtH1vLbVxHD5rXPg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3 diff --git a/services/ipfs-cluster.nix b/services/ipfs-cluster.nix index 9c08eb2..905041a 100644 --- a/services/ipfs-cluster.nix +++ b/services/ipfs-cluster.nix @@ -116,8 +116,10 @@ in [ "" "${pkgs.ipfs-cluster}/bin/ipfs-cluster-service daemon" ]; User = cfg.user; Group = cfg.group; + } // optionalAttrs (cfg.secretFile != null) { + EnvironmentFile = cfg.secretFile; }; }; - networking.firewall.allowedTCPPorts = mkIf cfg.openSwarmPort [ 9096 ]; + networking.firewall.allowedTCPPorts = mkIf cfg.openSwarmPort [ 9094 9096 ]; }; }