From fc084ab29b62bfa5d787a3df3cc0c7f01b3555d0 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 20 Dec 2021 08:42:52 +0100 Subject: [PATCH 1/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'simple-nixos-mailserver': 'gitlab:simple-nixos-mailserver/nixos-mailserver/5675b122a947b40e551438df6a623efad19fd2e7' (2021-06-06) → 'gitlab:simple-nixos-mailserver/nixos-mailserver/6e3a7b2ea6f0d68b82027b988aa25d3423787303' (2021-12-07) • Added input 'simple-nixos-mailserver/blobs': 'gitlab:simple-nixos-mailserver/blobs/2cccdf1ca48316f2cfd1c9a0017e8de5a7156265' (2020-11-10) • Added input 'simple-nixos-mailserver/nixpkgs-21_05': 'github:NixOS/nixpkgs/c06613c25df3fe1dd26243847a3c105cf6770627' (2021-07-07) • Added input 'simple-nixos-mailserver/nixpkgs-21_11': 'github:NixOS/nixpkgs/a640d8394f34714578f3e6335fc767d0755d78f9' (2021-12-01) --- flake.lock | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 188dc44..219d3c3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "blobs": { + "flake": false, + "locked": { + "lastModified": 1604995301, + "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "type": "gitlab" + } + }, "dogetipbot-telegram": { "inputs": { "nixpkgs": [ @@ -72,6 +88,36 @@ "type": "indirect" } }, + "nixpkgs-21_05": { + "locked": { + "lastModified": 1625692408, + "narHash": "sha256-e9L3TLLDVIJpMnHtiNHJE62oOh6emRtSZ244bgYJUZs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c06613c25df3fe1dd26243847a3c105cf6770627", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05", + "type": "indirect" + } + }, + "nixpkgs-21_11": { + "locked": { + "lastModified": 1638371214, + "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a640d8394f34714578f3e6335fc767d0755d78f9", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.11", + "type": "indirect" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1639876010, @@ -99,22 +145,25 @@ }, "simple-nixos-mailserver": { "inputs": { + "blobs": "blobs", "nixpkgs": [ "nixpkgs" ], + "nixpkgs-21_05": "nixpkgs-21_05", + "nixpkgs-21_11": "nixpkgs-21_11", "utils": "utils" }, "locked": { - "lastModified": 1622967674, - "narHash": "sha256-8RLe6Rqy2rKR/PGDMg/EVsWihsO+DQe/RYmlXdRZkLs=", + "lastModified": 1638911354, + "narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "5675b122a947b40e551438df6a623efad19fd2e7", + "rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-21.05", + "ref": "nixos-21.11", "repo": "nixos-mailserver", "type": "gitlab" } From d7936bda8e4accef57768ed027d4734819a61d52 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 20 Dec 2021 08:45:02 +0100 Subject: [PATCH 2/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'simple-nixos-mailserver/nixpkgs': follows 'nixpkgs' → follows 'nixpkgs-unstable' • Updated input 'simple-nixos-mailserver/nixpkgs-21_11': 'github:NixOS/nixpkgs/a640d8394f34714578f3e6335fc767d0755d78f9' (2021-12-01) → follows 'nixpkgs' --- flake.lock | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 219d3c3..f94c915 100644 --- a/flake.lock +++ b/flake.lock @@ -103,21 +103,6 @@ "type": "indirect" } }, - "nixpkgs-21_11": { - "locked": { - "lastModified": 1638371214, - "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a640d8394f34714578f3e6335fc767d0755d78f9", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-21.11", - "type": "indirect" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1639876010, @@ -147,10 +132,12 @@ "inputs": { "blobs": "blobs", "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ], "nixpkgs-21_05": "nixpkgs-21_05", - "nixpkgs-21_11": "nixpkgs-21_11", + "nixpkgs-21_11": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { From 289277f4a408afd510f6cf92bdc440fb974dcf01 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 20 Dec 2021 08:45:45 +0100 Subject: [PATCH 3/6] update mailserver module --- flake.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index fe76ddc..1a97e1f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,11 @@ nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1"; simple-nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.05"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.11"; + inputs = { + nixpkgs.follows = "nixpkgs-unstable"; + nixpkgs-21_11.follows = "nixpkgs"; + }; }; dogetipbot-telegram = { url = "gitlab:nyanloutre/dogetipbot-telegram/master"; From 8ebf479dc1238c3bc25da7412dab53237f6ca51d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 22 Dec 2021 22:54:44 +0100 Subject: [PATCH 4/6] prevent bouygues interface unset on switch --- systems/LoutreOS/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 62e1c55..cf299f5 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -112,7 +112,10 @@ }; systemd.network.networks = { - "40-bouygues".dhcpV4Config.RouteMetric = 1; + "40-bouygues" = { + dhcpV4Config.RouteMetric = 1; + networkConfig.KeepConfiguration = "dhcp-on-stop"; + }; "40-enp0s21u2".dhcpV4Config.RouteMetric = 1024; }; From 4edc552df2ec8f091acf8b9f637a19eebdc2f5ab Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 22 Dec 2021 22:55:01 +0100 Subject: [PATCH 5/6] allow access to rspamd web UI --- systems/LoutreOS/services.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index 811b9ce..0cffabc 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -87,7 +87,7 @@ in }; rspamd.workers.controller.extraConfig = '' - secure_ip = ["127.0.0.1", "10.30.135.71"]; + secure_ip = ["0.0.0.0/0"]; ''; redis.enable = true; From e3fb937c8af0fa2575a760121de2de72360837ca Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 22 Dec 2021 22:55:44 +0100 Subject: [PATCH 6/6] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file changes: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e6377ff35544226392b49fa2cf05590f9f0c4b43' (2021-12-19) → 'github:NixOS/nixpkgs/9ab7d12287ced0e1b4c03b61c781901f178d9d77' (2021-12-21) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/395879c28386e1abf20c7ecacd45880759548391' (2021-12-19) → 'github:NixOS/nixpkgs/81cef6b70fb5d5cdba5a0fef3f714c2dadaf0d6d' (2021-12-22) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index f94c915..7b4f460 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1639891440, - "narHash": "sha256-FJxa6ObwOQKZy3VhwN5bJRzX+MV/Yq9WLHK/4jlPKrs=", + "lastModified": 1640077788, + "narHash": "sha256-YMSDk3hlucJTTARaHNOeQEF6zEW3A/x4sXgrz94VbS0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6377ff35544226392b49fa2cf05590f9f0c4b43", + "rev": "9ab7d12287ced0e1b4c03b61c781901f178d9d77", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1639876010, - "narHash": "sha256-naGsoUfsY92NaIGiFI8XFXBnesw8BQGe694xcfaLMDI=", + "lastModified": 1640139330, + "narHash": "sha256-Nkp3wUOGwtoQ7EH28RLVJ7EqB/e0TU7VcsM7GLy+SdY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "395879c28386e1abf20c7ecacd45880759548391", + "rev": "81cef6b70fb5d5cdba5a0fef3f714c2dadaf0d6d", "type": "github" }, "original": {