DGNum/infrastructure
13
6
Fork 3
Code Issues 20 Pull requests 8 Projects 1 Releases Packages Wiki Activity Actions

feat(metis): Use providers from upstream

Browse source
This commit is contained in:
sinavir 2023-10-20 20:10:55 +02:00
parent 6476bd9adb
commit 14b436f331
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
machines/web01/metis/default.nix
View file

@ -1,13 +1,10 @@
{ lib, pkgs, sources, ... }: { lib, pkgs, sources, ... }:
let let
package = (import sources.metis { inherit pkgs; }).production; metis = import sources.metis { inherit pkgs; };
package = metis.production;
inherit (metis) providers;
providers = {
klub-reseau = "nuage.beta.rz.ens.wtf";
eleves-ens = "cloud.eleves.ens.fr";
frama-agenda = "framagenda.org";
};
in { in {
@ -19,16 +16,14 @@ in {
forceSSL = true; forceSSL = true;
root = package; root = package;
locations = lib.mapAttrs' (name: attrs: locations = lib.mapAttrs' (name: value:
lib.nameValuePair "/cal/${name}/" { lib.nameValuePair "/cal/${name}/" {
extraConfig = '' extraConfig = ''
proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host; proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass https://${ proxy_pass ${value};
providers.${name} '';
}/remote.php/dav/public-calendars/;
'';
}) providers; }) providers;
extraConfig = '' extraConfig = ''

4
npins/sources.json
View file

@ -72,9 +72,9 @@
"url": "https://git.dgnum.eu/DGNum/metis" "url": "https://git.dgnum.eu/DGNum/metis"
}, },
"branch": "master", "branch": "master",
"revision": "b5b9941560171832b96669a6566c758c0c1a1993", "revision": "1a151d6cf48acf9eef18f4600ebb6cce2f3b4786",
"url": null, "url": null,
"hash": "0zbdqlanp799saph4x91xwvwxb53d9nj42d6nlydgajnk6gmvc35" "hash": "1anq6848vy4is8pgq5rkcmpa6kiv31lpbiw6kk030r2qn6amnqhw"
}, },
"nix-lib": { "nix-lib": {
"type": "GitRelease", "type": "GitRelease",