Compare commits
4 commits
5fcb84f6e3
...
1ea922c3f1
Author | SHA1 | Date | |
---|---|---|---|
|
1ea922c3f1 | ||
|
5b22e8e88d | ||
|
bb677cf509 | ||
|
df45e2bd10 |
7 changed files with 37 additions and 16 deletions
|
@ -61,6 +61,4 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
dgn-secrets.matches."^ds_fr-.*$" = { owner = "ds-fr"; };
|
dgn-secrets.matches."^ds_fr-.*$" = { owner = "ds-fr"; };
|
||||||
|
|
||||||
users.users.ds-fr.extraGroups = [ "sendmail" ];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ lib.extra.mkConfig {
|
||||||
"metis"
|
"metis"
|
||||||
"linkal"
|
"linkal"
|
||||||
"plausible"
|
"plausible"
|
||||||
# "wordpress"
|
"wordpress"
|
||||||
];
|
];
|
||||||
|
|
||||||
root = ./.;
|
root = ./.;
|
||||||
|
|
11
machines/web01/wordpress/default.nix
Normal file
11
machines/web01/wordpress/default.nix
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{ ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./lavoixduntexte.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
services.wordpress = {
|
||||||
|
webserver = "nginx";
|
||||||
|
};
|
||||||
|
}
|
12
machines/web01/wordpress/lavoixduntexte.nix
Normal file
12
machines/web01/wordpress/lavoixduntexte.nix
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
_:
|
||||||
|
|
||||||
|
let host = "lavoixduntexte.normalesup.eu";
|
||||||
|
|
||||||
|
in {
|
||||||
|
services.wordpress.sites.${host} = { database.tablePrefix = "wp_lvdt_"; };
|
||||||
|
|
||||||
|
services.nginx.virtualHosts.${host} = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
};
|
||||||
|
}
|
|
@ -61,9 +61,9 @@
|
||||||
"repo": "Linkal"
|
"repo": "Linkal"
|
||||||
},
|
},
|
||||||
"branch": "main",
|
"branch": "main",
|
||||||
"revision": "8744b00eb819f181842f678bed6c1239f8210618",
|
"revision": "c4c6f0f858870f3713af351b1783faf628de4f44",
|
||||||
"url": "https://github.com/JulienMalka/Linkal/archive/8744b00eb819f181842f678bed6c1239f8210618.tar.gz",
|
"url": "https://github.com/JulienMalka/Linkal/archive/c4c6f0f858870f3713af351b1783faf628de4f44.tar.gz",
|
||||||
"hash": "03nk7x078bcvvv4i9xn29hpv041zxy62z2lfigxwdq1m8cnbwziw"
|
"hash": "1qgn1k3bgx8w50az302bv6id62ly0x78276ak56qb91q9vmpmml7"
|
||||||
},
|
},
|
||||||
"metis": {
|
"metis": {
|
||||||
"type": "Git",
|
"type": "Git",
|
||||||
|
@ -105,20 +105,20 @@
|
||||||
"nixos-23.05": {
|
"nixos-23.05": {
|
||||||
"type": "Channel",
|
"type": "Channel",
|
||||||
"name": "nixos-23.05",
|
"name": "nixos-23.05",
|
||||||
"url": "https://releases.nixos.org/nixos/23.05/nixos-23.05.3976.32dcb45f66c0/nixexprs.tar.xz",
|
"url": "https://releases.nixos.org/nixos/23.05/nixos-23.05.4076.8a4c17493e5c/nixexprs.tar.xz",
|
||||||
"hash": "1sv26mm7rdlxbx4df353razv6pl7rh0xak60nsvjgc1d6dk9hxcn"
|
"hash": "1089g6nvg57iam6wsbhbf87kwyifvf73blk1lxshawvvwgbm1364"
|
||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"type": "Channel",
|
"type": "Channel",
|
||||||
"name": "nixos-unstable",
|
"name": "nixos-unstable",
|
||||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-23.11pre530560.f5892ddac112/nixexprs.tar.xz",
|
"url": "https://releases.nixos.org/nixos/unstable/nixos-23.11pre532072.81e8f48ebdec/nixexprs.tar.xz",
|
||||||
"hash": "0i4hycnrl8m38gyk5qv76wr8zkwd0g9swgwhwhaczrfczskpms31"
|
"hash": "15i387g7qay6qkrsvgdhxyxyd5a3xw4q4lf1d0ah4d8p3agj2nfg"
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"type": "Channel",
|
"type": "Channel",
|
||||||
"name": "nixpkgs-unstable",
|
"name": "nixpkgs-unstable",
|
||||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-23.11pre531165.f902cb49892d/nixexprs.tar.xz",
|
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-23.11pre533288.b604023e0a55/nixexprs.tar.xz",
|
||||||
"hash": "15kf50lzlrlbsdsrb1v86nzz6xli1sx98agqkgv1lvld0vda4vfg"
|
"hash": "1krapgr2z37bsqk5jwrddr66yjz6fm7cdzjgz6sa1nwh5ac62gr4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"version": 3
|
"version": 3
|
||||||
|
|
|
@ -94,14 +94,14 @@
|
||||||
# outline: 0.71.0 -> 0.72.0
|
# outline: 0.71.0 -> 0.72.0
|
||||||
{
|
{
|
||||||
id = 259246;
|
id = 259246;
|
||||||
hash = "sha256-6PFohGAbDYUZhsibfttp8qS/JKeySC3+IH8DlK6G2wc=";
|
hash = "sha256-GMwtKnsBkik2N8bzoCUaxKgZoFaHjGWtLTANXcC+CsE=";
|
||||||
}
|
}
|
||||||
|
|
||||||
# nixos/outline: Add the possibility of using local storage instead of S3
|
# nixos/outline: Add the possibility of using local storage instead of S3
|
||||||
{
|
{
|
||||||
id = 259254;
|
id = 259254;
|
||||||
excludes = [ "nixos/doc/manual/*" ];
|
excludes = [ "nixos/doc/manual/*" ];
|
||||||
hash = "sha256-Ybh4iO7kA4w/ITqkbz7MJPIR+Xl4DPfsujV20ueqLSw=";
|
hash = "sha256-Hd3bRYncjnfHzEx+g6rb9cU3YmhF6W3QOtQUuDzw78U=";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ index d21097df07b..2ee652d8785 100644
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "forgejo";
|
pname = "forgejo";
|
||||||
- version = "1.19.4-0";
|
- version = "1.19.4-0";
|
||||||
+ version = "1.20.4-1";
|
+ version = "1.20.5-0";
|
||||||
|
|
||||||
src = fetchFromGitea {
|
src = fetchFromGitea {
|
||||||
domain = "codeberg.org";
|
domain = "codeberg.org";
|
||||||
|
@ -24,7 +24,7 @@ index d21097df07b..2ee652d8785 100644
|
||||||
repo = "forgejo";
|
repo = "forgejo";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
- hash = "sha256-pTcnST8A4gADPBkNago9uwRFEmTx8vNONL/Emer4xLI=";
|
- hash = "sha256-pTcnST8A4gADPBkNago9uwRFEmTx8vNONL/Emer4xLI=";
|
||||||
+ hash = "sha256-Fxlj+ckw1LSgiQDex3ZizHakIKd52U6JcdTurJj8YWg=";
|
+ hash = "sha256-tuwMvSWaMUc/GghmrbGLtyjixwOwiapWEOMD9QmMLic=";
|
||||||
};
|
};
|
||||||
|
|
||||||
- vendorHash = "sha256-LKxhNbSIRaP4EGWX6mE26G9CWfoFTrPRjrL4ShpRHWo=";
|
- vendorHash = "sha256-LKxhNbSIRaP4EGWX6mE26G9CWfoFTrPRjrL4ShpRHWo=";
|
||||||
|
|
Loading…
Reference in a new issue