From f6253021d77743fb21d00cf14443b822ccda7d3b Mon Sep 17 00:00:00 2001 From: sinavir Date: Wed, 18 Sep 2024 14:21:13 +0200 Subject: [PATCH] feat(nuit website): migrate to s3 --- machines/storage01/_configuration.nix | 1 + machines/storage01/garage.nix | 2 ++ machines/storage01/redirections.nix | 9 +++++++++ machines/web01/static/npins/sources.json | 13 +------------ 4 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 machines/storage01/redirections.nix diff --git a/machines/storage01/_configuration.nix b/machines/storage01/_configuration.nix index a15da38..32989ac 100644 --- a/machines/storage01/_configuration.nix +++ b/machines/storage01/_configuration.nix @@ -18,6 +18,7 @@ lib.extra.mkConfig { "netbird" "peertube" "prometheus" + "redirections" ]; extraConfig = { diff --git a/machines/storage01/garage.nix b/machines/storage01/garage.nix index f8d9ffb..29c88ff 100644 --- a/machines/storage01/garage.nix +++ b/machines/storage01/garage.nix @@ -8,12 +8,14 @@ let metadata_dir = "/data/fast/garage/meta"; domains = [ + "lanuit.ens.fr" "boussole-sante.normalesup.eu" "simi.normalesup.eu" "bandarretdurgence.ens.fr" ]; buckets = [ + "nuit-website" "castopod-dgnum" "peertube-videos-dgnum" "banda-website" diff --git a/machines/storage01/redirections.nix b/machines/storage01/redirections.nix new file mode 100644 index 0000000..f8c1558 --- /dev/null +++ b/machines/storage01/redirections.nix @@ -0,0 +1,9 @@ +{ + dgn-redirections = { + redirections = { + "www.lanuit.ens.fr" = "lanuit.ens.fr"; + "lanuit.ens.psl.eu" = "lanuit.ens.fr"; + "www.lanuit.ens.psl.eu" = "lanuit.ens.fr"; + }; + }; +} diff --git a/machines/web01/static/npins/sources.json b/machines/web01/static/npins/sources.json index e4a3d55..30372b0 100644 --- a/machines/web01/static/npins/sources.json +++ b/machines/web01/static/npins/sources.json @@ -33,17 +33,6 @@ "url": null, "hash": "05cdz26n8r8cihmcn772dwb05krzzxyyhqv5rasw4yd2s1dzsmwx" }, - "lanuit.ens.fr": { - "type": "Git", - "repository": { - "type": "Git", - "url": "https://git.dgnum.eu/DGNum/lanuit.ens.fr.git" - }, - "branch": "main", - "revision": "f4dc07090fbd74970929b2cf411c74b090618c8f", - "url": null, - "hash": "0hpym1r8d8hgp4g7p6lk26fgcv9ia6993z91as1gfjs9ff3wgk0a" - }, "qda.ens.fr": { "type": "Git", "repository": { @@ -90,4 +79,4 @@ } }, "version": 3 -} \ No newline at end of file +}