From f74fd8c8ebc06a995be06793b85faa94dfc41671 Mon Sep 17 00:00:00 2001 From: sinavir Date: Sat, 16 Mar 2024 16:17:02 +0100 Subject: [PATCH] feat(simiweb): Move to S3 --- machines/storage01/garage.nix | 3 +++ machines/web01/static/default.nix | 13 +------------ npins/sources.json | 11 ----------- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/machines/storage01/garage.nix b/machines/storage01/garage.nix index 446aee2..e4d0fcd 100644 --- a/machines/storage01/garage.nix +++ b/machines/storage01/garage.nix @@ -18,6 +18,9 @@ let "boussole-sante.normalesup.eu" = { mainDomain = true; }; + "simi.normalesup.eu" = { + mainDomain = true; + }; }; in { diff --git a/machines/web01/static/default.nix b/machines/web01/static/default.nix index 6ff068f..d07a28f 100644 --- a/machines/web01/static/default.nix +++ b/machines/web01/static/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - sources, - ... -}: +{ lib, ... }: let inherit (lib) recursiveUpdate; @@ -24,11 +19,5 @@ in "eleves.dgnum.eu".locations."/".tryFiles = "$uri $uri/index.html /fr/$uri /en/$uri /fr/index.html"; "retired.dgnum.eu".locations."/".tryFiles = "/index.html =404"; - - "simi.normalesup.eu" = { - enableACME = true; - forceSSL = true; - root = (import sources.simiweb { inherit pkgs; }).site; - }; }; } diff --git a/npins/sources.json b/npins/sources.json index c1029ac..d02e5fb 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -154,17 +154,6 @@ "url": "https://github.com/cachix/pre-commit-hooks.nix/archive/5df5a70ad7575f6601d91f0efec95dd9bc619431.tar.gz", "hash": "08wz19qh89bi15b7y1a5dcdj6l4bar39k0jfhcy60glywkmn1qrk" }, - "simiweb": { - "type": "Git", - "repository": { - "type": "Git", - "url": "https://git.dgnum.eu/jmarquet/simiweb" - }, - "branch": "master", - "revision": "dfb86101e45f56416e17d6a501c29e764b02d486", - "url": null, - "hash": "1k8nrc9zzhmxb6szr2lvrzx5krmibdlc1n79620xxif2gaiglkn8" - }, "wp4nix": { "type": "Git", "repository": {