Compare commits

...

4 commits

Author SHA1 Message Date
Tom Hubrecht
7b7ea46b94 feat(workflows): Run now
Some checks failed
npins update / npins_update (push) Failing after 19s
2023-12-11 15:55:06 +01:00
Tom Hubrecht
e49a967b20 feat(attic): Disable flake overlay 2023-12-11 15:54:36 +01:00
Tom Hubrecht
8234dfbb74 feat(www.eleves): Deploy eleves webpage on web01 2023-12-11 15:54:00 +01:00
Tom Hubrecht
ea1087cedf feat(forgejo): Upgrade to 1.21.2-0 2023-12-11 15:53:37 +01:00
6 changed files with 60 additions and 4 deletions

View file

@ -1,8 +1,8 @@
name: npins update name: npins update
on: on:
schedule: schedule:
# Run at 13 o'clock every monday # Run at 16 o'clock every monday
- cron: "0 13 * * 1" - cron: "0 16 * * 1"
jobs: jobs:
npins_update: npins_update:

View file

@ -1,4 +1,4 @@
{ config, ... }: { config, pkgs, sources, ... }:
let host = "cachix.dgnum.eu"; let host = "cachix.dgnum.eu";
@ -41,6 +41,9 @@ in {
endpoint = "https://s3.dgnum.eu"; endpoint = "https://s3.dgnum.eu";
}; };
}; };
useFlakeCompatOverlay = false;
package = pkgs.callPackage "${sources.attic}/package.nix" { };
}; };
nginx = { nginx = {

View file

@ -9,6 +9,7 @@ lib.extra.mkConfig {
enabledServices = [ enabledServices = [
# List of services to enable # List of services to enable
"castopod" "castopod"
"eleves"
"metis" "metis"
"linkal" "linkal"
"matterbridge" "matterbridge"

18
machines/web01/eleves.nix Normal file
View file

@ -0,0 +1,18 @@
{ sources, ... }:
let
host = "eleves.dgnum.eu";
serverAliases = [ ];
in {
services.nginx.virtualHosts.${host} = {
inherit serverAliases;
enableACME = true;
forceSSL = true;
root = "${sources.www-eleves.outPath}/www";
locations."/" = {
tryFiles = "$uri /fr/$uri /en/$uri /fr/index.html";
};
};
}

View file

@ -131,6 +131,17 @@
"name": "nixpkgs-unstable", "name": "nixpkgs-unstable",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.05pre553710.010c7296f3b1/nixexprs.tar.xz", "url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.05pre553710.010c7296f3b1/nixexprs.tar.xz",
"hash": "1h6q7vpy8rwcxfc7l34kvix1rhirgxysn7n0r7ivmwhd9s9rbbw7" "hash": "1h6q7vpy8rwcxfc7l34kvix1rhirgxysn7n0r7ivmwhd9s9rbbw7"
},
"www-eleves": {
"type": "Git",
"repository": {
"type": "Git",
"url": "https://git.dgnum.eu/DGNum/www.eleves.ens.fr.git"
},
"branch": "main",
"revision": "8b3e9e99dbd4b1c6e6cad0dc42b103b5e6f78ef0",
"url": null,
"hash": "0avlgj967wn1w06lqc29cdg9p7msb4y01nbx38kflxgw0f0kysw2"
} }
}, },
"version": 3 "version": 3

View file

@ -1,11 +1,34 @@
{ {
"nixos-23.11" = [ "nixos-23.11" = [
{ id = 241542; revert = true; hash = "sha256-uiRokmJewTLURuQkPWRfb3jgxjaDwfkXntj8PWk6pi8="; } {
id = 241542;
revert = true;
hash = "sha256-uiRokmJewTLURuQkPWRfb3jgxjaDwfkXntj8PWk6pi8=";
}
# castopod: 1.6.4 -> 1.7.0 + ajout du support de loadcredentials # castopod: 1.6.4 -> 1.7.0 + ajout du support de loadcredentials
{ {
_type = "static"; _type = "static";
path = ./castopod.patch; path = ./castopod.patch;
} }
# forgejo: 1.20.5-1 -> 1.20.6-0 [revert]
{
id = 270697;
revert = true;
hash = "sha256-yJ5IkhlwH0hUsupOeZtTkdvWbMMQK2JKpcIPlKQjkp8=";
}
# forgejo: 1.20.5-1 -> 1.21.1-0
{
id = 270195;
hash = "sha256-c65ENvvGVKrFUzx/rlWVPTsvWY8L4zPH3/lOMwvJyiA=";
}
# forgejo: 1.21.1-0 -> 1.21.2-0
{
id = 273035;
hash = "sha256-bxuXH6KZGdu1yIgyeAHP+K7xGgJ404jSE32saGHf9KM=";
}
]; ];
} }