From 1808cdc632e163b8133c1d1708b7e392cdcc0f1d Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Wed, 22 Jun 2022 18:52:20 +0200 Subject: [PATCH] Update Flake inputs --- flake.lock | 88 +++++++++++++++---------- flake.nix | 4 +- hardware/hetzner-dedicated-storage1.nix | 2 +- modules/nextcloud.nix | 3 +- modules/nginx.nix | 2 +- modules/synapse.nix | 49 +++++++------- 6 files changed, 86 insertions(+), 62 deletions(-) diff --git a/flake.lock b/flake.lock index b1187da..4da0ef9 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1648475189, - "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=", + "lastModified": 1653594315, + "narHash": "sha256-kJ0ENmnQJ4qL2FeYKZba9kvv1KmIuB3NVpBwMeI7AJQ=", "owner": "serokell", "repo": "deploy-rs", - "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3", + "rev": "184349d8149436748986d1bdba087e4149e9c160", "type": "github" }, "original": { @@ -68,43 +68,60 @@ "type": "github" } }, - "nixpkgs-21_05": { + "nixpkgs-21_11": { "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", + "lastModified": 1655562720, + "narHash": "sha256-OrN8DkBRZqZMzMuECuQNvSQ5gWoFBCxDvxYXjIQ/pH0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "rev": "27dffce7eaa9648b4a13a461e786f169a17c0889", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-21.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-22_05": { + "locked": { + "lastModified": 1654936503, + "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dab6df51387c3878cdea09f43589a15729cae9f4", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.05", + "ref": "nixos-22.05", "type": "indirect" } }, - "nixpkgs-21_11": { + "nixpkgs-22_05_2": { "locked": { - "lastModified": 1651743098, - "narHash": "sha256-NuQNu6yHh54li0kZffM59FRC5bWCJusygL4Cy+3O0fY=", + "lastModified": 1655584987, + "narHash": "sha256-YmWxPm6ctu+9nV80DtYtMfOBosNymeTpj8+Z0JTDfhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4191fe35cbe52f755ef73009d4d37b9e002efa2", + "rev": "57622cb817210146b379adbbd036d3da0d1f367c", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-21.11", - "type": "indirect" + "owner": "NixOS", + "ref": "release-22.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1651726670, - "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=", + "lastModified": 1655807518, + "narHash": "sha256-5YV29Ry/DpAJc/0Hc/+ISVBAjwHpJvAkeKkcUG5lWsc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01", + "rev": "a72d7811be1162dd6804c4e36e5402d76fb6e921", "type": "github" }, "original": { @@ -116,27 +133,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1651743098, - "narHash": "sha256-NuQNu6yHh54li0kZffM59FRC5bWCJusygL4Cy+3O0fY=", + "lastModified": 1655729248, + "narHash": "sha256-5GrrkHaXknG1M4lYskTR3H9Ghzdmdhp8LhFL9xEKwtU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d4191fe35cbe52f755ef73009d4d37b9e002efa2", + "rev": "d423c0ce15adf573c2045bef5c921b958b674bb4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-21.11", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1607522989, - "narHash": "sha256-o/jWhOSAlaK7y2M57OIriRt6whuVVocS/T0mG7fd1TI=", + "lastModified": 1642635915, + "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9158eca70ae59e73fae23be5d13d3fa0cfc78b4", + "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f", "type": "github" }, "original": { @@ -158,21 +175,20 @@ "inputs": { "blobs": "blobs", "nixpkgs": "nixpkgs_3", - "nixpkgs-21_05": "nixpkgs-21_05", - "nixpkgs-21_11": "nixpkgs-21_11", + "nixpkgs-22_05": "nixpkgs-22_05", "utils": "utils_2" }, "locked": { - "lastModified": 1638911354, - "narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=", + "lastModified": 1655214255, + "narHash": "sha256-hgFF2X9mxFieekDh2VoVAtgwuM6XeAwzvb53yakmjTg=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303", + "rev": "a48082c79cff8f3b314ba4f95f4ae87ca7d4d068", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-21.11", + "ref": "nixos-22.05", "repo": "nixos-mailserver", "type": "gitlab" } @@ -181,14 +197,16 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-21_11": "nixpkgs-21_11", + "nixpkgs-22_05": "nixpkgs-22_05_2" }, "locked": { - "lastModified": 1649756291, - "narHash": "sha256-KTll8bCINAzIUGaaMrbn9wb5nfhkXRLgmFrWGR/Dku0=", + "lastModified": 1655707707, + "narHash": "sha256-PlDTG9w4FtoqnELKC+FYS2d2XCG/HGpBMqDX+V98pu4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c2614c4fe61943b3d280ac1892fcebe6e8eaf8c8", + "rev": "2a8d731e401889bd3e03b40da50f7314dee4a4da", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 087654a..f728245 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,11 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; deploy-rs.url = "github:serokell/deploy-rs"; - simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.11"; + simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.05"; }; outputs = { self, nixpkgs, nixpkgs-unstable, deploy-rs, sops-nix, simple-nixos-mailserver }: diff --git a/hardware/hetzner-dedicated-storage1.nix b/hardware/hetzner-dedicated-storage1.nix index 46e8e77..d7e2acc 100644 --- a/hardware/hetzner-dedicated-storage1.nix +++ b/hardware/hetzner-dedicated-storage1.nix @@ -8,7 +8,7 @@ boot.initrd.availableKernelModules = [ "ahci" "sd_mod" ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.initrd.mdadmConf = config.environment.etc."mdadm.conf".text; + boot.initrd.services.swraid.mdadmConf = config.environment.etc."mdadm.conf".text; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; boot.loader.systemd-boot.enable = false; diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix index afac462..fb8b215 100644 --- a/modules/nextcloud.nix +++ b/modules/nextcloud.nix @@ -62,8 +62,9 @@ in services.nextcloud = { enable = true; - package = pkgs.nextcloud22; + package = pkgs.nextcloud24; hostName = "cloud.${config.networking.domain}"; + https = true; config = { dbtype = "pgsql"; dbuser = "nextcloud"; diff --git a/modules/nginx.nix b/modules/nginx.nix index a486fcd..9a02b66 100644 --- a/modules/nginx.nix +++ b/modules/nginx.nix @@ -1,6 +1,6 @@ { pkgs, lib, config, ... }: { - security.acme.email = "letsencrypt.account@banditlair.com"; + security.acme.defaults.email = "letsencrypt.account@banditlair.com"; security.acme.acceptTerms = true; services.nginx = { diff --git a/modules/synapse.nix b/modules/synapse.nix index 98402dc..d235075 100644 --- a/modules/synapse.nix +++ b/modules/synapse.nix @@ -17,9 +17,6 @@ let ''; in { - security.acme.email = "letsencrypt.account@banditlair.com"; - security.acme.acceptTerms = true; - services.nginx = { virtualHosts = { # This host section can be placed on a different host than the rest, @@ -113,26 +110,34 @@ in services.matrix-synapse = { enable = true; - server_name = config.networking.domain; - listeners = [ - { - port = 8008; - bind_address = "::1"; - type = "http"; - tls = false; - x_forwarded = true; - resources = [ - { - names = [ "client" "federation" ]; - compress = false; - } - ]; - } - ]; - database_type = "psycopg2"; - database_args = { - host = "fake"; # This section is overriden in deploy_nixos keys + settings = { + server_name = config.networking.domain; + + listeners = [ + { + port = 8008; + bind_addresses = [ "::1" ]; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ + { + names = [ "client" "federation" ]; + compress = false; + } + ]; + } + ]; + database = { + name = "psycopg2"; + args = { + host = "fake"; # This section is overriden by "extraConfigFiles" + }; + }; }; + + + dataDir = "/nix/var/data/matrix-synapse"; extraConfigFiles = [ "/run/synapse/synapse-db-config.yaml" ]; };