From 18b6744ef15f7bae9ddb181afabfbb66df8e3a8f Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Thu, 28 Sep 2023 12:14:38 +0200 Subject: [PATCH] feat(npins): Add calendrier.eleves.ens.fr Also deploy updated version with analytics --- machines/web01/metis/default.nix | 12 ++++++++---- npins/sources.json | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/machines/web01/metis/default.nix b/machines/web01/metis/default.nix index 1a42ad5..a767881 100644 --- a/machines/web01/metis/default.nix +++ b/machines/web01/metis/default.nix @@ -1,8 +1,6 @@ { lib, pkgs, sources, ... }: let - host = "calendrier.dgnum.eu"; - package = pkgs.callPackage ./package.nix { src = sources.metis; }; providers = { @@ -10,8 +8,8 @@ let eleves-ens = "cloud.eleves.ens.fr"; frama-agenda = "framagenda.org"; }; -in { - services.nginx.virtualHosts.${host} = { + + nginxConf = { enableACME = true; forceSSL = true; root = package; @@ -28,4 +26,10 @@ in { ''; }) providers; }; + +in { + services.nginx.virtualHosts = { + "calendrier.eleves.ens.fr" = nginxConf; + "calendrier.dgnum.eu" = nginxConf; + }; } diff --git a/npins/sources.json b/npins/sources.json index 575f993..a95511f 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -60,9 +60,9 @@ "url": "https://git.dgnum.eu/DGNum/metis" }, "branch": "master", - "revision": "f086aab2bf940035acab3ea6c3c15ebd966ebe8c", + "revision": "d5a7f393842abc0ed5d808f1dab4c9946eb7f910", "url": null, - "hash": "0inivyfsq86bwsfqcrflj9mkx1lcsn0g2y2lpk03ibh417jxq1vx" + "hash": "0rpyj5sczpx5yc1zjfs06n6kblcik9kl4jj1mqf1igppif0ypp0l" }, "nix-lib": { "type": "GitRelease",