From 43594475969e8d29a30276ad7430ababa0ba8e59 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 25 Jan 2024 17:08:47 +0100 Subject: [PATCH] feat(static): Move retired.dgnum.eu from specific config to static automated config --- machines/web01/redirections.nix | 11 ++--------- machines/web01/static/npins/sources.json | 11 +++++++++++ npins/sources.json | 11 ----------- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/machines/web01/redirections.nix b/machines/web01/redirections.nix index 20b4b78..539dc27 100644 --- a/machines/web01/redirections.nix +++ b/machines/web01/redirections.nix @@ -1,4 +1,4 @@ -{ sources, ... }: +_: let retired_host = "retired.dgnum.eu"; @@ -42,14 +42,7 @@ let in { services.nginx.virtualHosts = { - ${retired_host} = { - enableACME = true; - forceSSL = true; - - root = "${sources.dgnum-retired.outPath}/www"; - - default = true; - }; + ${retired_host}.default = true; } // (builtins.mapAttrs (host: { to, ssl ? true }: { globalRedirect = to; diff --git a/machines/web01/static/npins/sources.json b/machines/web01/static/npins/sources.json index d1f71d7..b0ca5df 100644 --- a/machines/web01/static/npins/sources.json +++ b/machines/web01/static/npins/sources.json @@ -54,6 +54,17 @@ "revision": "e6084bbbdccee3d700037b5f34ead386d649c470", "url": null, "hash": "1p4xn5g1awrgx9wr9pv2xjz7myrpb77i8fj1qdc9qfdnjjz6didi" + }, + "retired.dgnum.eu": { + "type": "Git", + "repository": { + "type": "Git", + "url": "https://git.dgnum.eu/DGNum/retired.dgnum.eu.git" + }, + "branch": "main", + "revision": "735e56edee3b8a74c6d77463b6535308ac85c7b1", + "url": null, + "hash": "0mbk3r2r4r4z1vzddizbf59mm5r2f0ikis0scyfc6qpb4lr78msy" } }, "version": 3 diff --git a/npins/sources.json b/npins/sources.json index 845469d..9e02363 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -26,17 +26,6 @@ "url": "https://github.com/zhaofengli/attic/archive/fbe252a5c21febbe920c025560cbd63b20e24f3b.tar.gz", "hash": "1dpsqf1m8vklhgy2ganikihdj0fp4vk34r0ajd4jvq8pxvhcmlwz" }, - "dgnum-retired": { - "type": "Git", - "repository": { - "type": "Git", - "url": "https://git.dgnum.eu/DGNum/dgnum-retired" - }, - "branch": "main", - "revision": "735e56edee3b8a74c6d77463b6535308ac85c7b1", - "url": null, - "hash": "0mbk3r2r4r4z1vzddizbf59mm5r2f0ikis0scyfc6qpb4lr78msy" - }, "disko": { "type": "GitRelease", "repository": {