From 990d48a1c7a40406ce3a94a73b708e864b58fcae Mon Sep 17 00:00:00 2001 From: stuebinm Date: Mon, 8 Jan 2024 22:21:05 +0100 Subject: [PATCH] update inputs; simple-nixos-mailserver now has a 23.11 branch --- flake.lock | 48 ++++++++++++++++++++++++++-------------- flake.nix | 2 +- services/nginx-pages.nix | 7 ++++++ 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 9aeaff5..084c558 100644 --- a/flake.lock +++ b/flake.lock @@ -686,11 +686,11 @@ "waybar-iceportal": "waybar-iceportal" }, "locked": { - "lastModified": 1703525710, - "narHash": "sha256-GuunHCojW4Lt3JGj/Oq8SnDeY06wLKM4bVYFQswjf1I=", + "lastModified": 1704367347, + "narHash": "sha256-Soj8EFuFTZJUkuZrQWxjIVdpKaZC7lFvI9uEdV5UJR0=", "owner": "hexchen", "repo": "nixfiles", - "rev": "7e507df2e83373955a257f719f9fa6f6d6d940a1", + "rev": "f59bf3c4dea34df41eb2bd61eda3a72d1b6623fe", "type": "gitlab" }, "original": { @@ -743,22 +743,23 @@ "nixpkgs-23_05": [ "nixpkgs" ], + "nixpkgs-23_11": "nixpkgs-23_11", "utils": [ "deploy-rs", "utils" ] }, "locked": { - "lastModified": 1703666786, - "narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=", + "lastModified": 1703023684, + "narHash": "sha256-XQU4OaacV0F2tf9cNAvIMqlC0HBIrAtvb0MLjIHt+7M=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4", + "rev": "4bfb8eb058f098302c97b909df2d019926e11220", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "master", + "ref": "nixos-23.11", "repo": "nixos-mailserver", "type": "gitlab" } @@ -809,6 +810,21 @@ "type": "github" } }, + "nixpkgs-23_11": { + "locked": { + "lastModified": 1704420045, + "narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -860,11 +876,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703992652, - "narHash": "sha256-C0o8AUyu8xYgJ36kOxJfXIroy9if/G6aJbNOpA5W0+M=", + "lastModified": 1704420045, + "narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32f63574c85fbc80e4ba1fbb932cde9619bad25e", + "rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d", "type": "github" }, "original": { @@ -875,11 +891,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1703499205, - "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", + "lastModified": 1704161960, + "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", + "rev": "63143ac2c9186be6d9da6035fa22620018c85932", "type": "github" }, "original": { @@ -1116,11 +1132,11 @@ ] }, "locked": { - "lastModified": 1703991717, - "narHash": "sha256-XfBg2dmDJXPQEB8EdNBnzybvnhswaiAkUeeDj7fa/hQ=", + "lastModified": 1704596510, + "narHash": "sha256-tupdwwg1WeX2hNMOQrvtyafTaTVty0QC/gQp7yaYJic=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cfdbaf68d00bc2f9e071f17ae77be4b27ff72fa6", + "rev": "f5fbcc0f50e7fc60c4f806fa7a09abccf0826d8a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7a6870f..bfc8dd8 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ nixpkgs-oldstable.url = "github:/NixOS/nixpkgs?rev=c4aec3c021620d98861639946123214207e98344"; nix-hexchen.url = "gitlab:hexchen/nixfiles"; - nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; tracktrain.url = "git+https://stuebinm.eu/git/tracktrain?ref=main"; tracktrain.flake = false; diff --git a/services/nginx-pages.nix b/services/nginx-pages.nix index 7f7a156..a968446 100644 --- a/services/nginx-pages.nix +++ b/services/nginx-pages.nix @@ -6,4 +6,11 @@ enable = true; directory = ../websites; }; + + + services.nginx.virtualHosts."parsons.hacc.space" = { + enableACME = true; + forceSSL = true; + locations."/~stuebinm/".root = "/persist/www/"; + }; }