Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 1 Projects Releases Packages Wiki Activity Actions

skynet: website working again

Browse source
This commit is contained in:
silver 2023-07-21 21:27:01 +01:00
parent 057a80356c
commit 4c99464bc4
3 changed files with 80 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
flake.lock
View file

@ -275,6 +275,20 @@
"type": "indirect"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1689935543,
"narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e43e2448161c0a2c4928abec4e16eae1516571bc",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": {
"inputs": {
"agenix": "agenix",
@ -283,7 +297,8 @@
"nixpkgs": "nixpkgs_3",
"simple-nixos-mailserver": "simple-nixos-mailserver",
"skynet_ldap_backend": "skynet_ldap_backend",
"skynet_ldap_frontend": "skynet_ldap_frontend"
"skynet_ldap_frontend": "skynet_ldap_frontend",
"skynet_website": "skynet_website"
}
},
"simple-nixos-mailserver": {
@ -348,6 +363,27 @@
"url": "https://gitlab.skynet.ie/compsoc/skynet/ldap/frontend.git"
}
},
"skynet_website": {
"inputs": {
"nixpkgs": "nixpkgs_8",
"utils": "utils_4"
},
"locked": {
"host": "gitlab.skynet.ie",
"lastModified": 1689960297,
"narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=",
"owner": "compsoc%2Fskynet",
"repo": "website",
"rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99",
"type": "gitlab"
},
"original": {
"host": "gitlab.skynet.ie",
"owner": "compsoc%2Fskynet",
"repo": "website",
"type": "gitlab"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
@ -378,6 +414,21 @@
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1605370193,
@ -428,6 +479,24 @@
"repo": "flake-utils",
"type": "github"
}
},
"utils_4": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",

9
flake.nix
View file

@ -16,8 +16,10 @@
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
# sso.skynet.ie
skynet_ldap_backend.url = "git+https://gitlab.skynet.ie/compsoc/skynet/ldap/backend.git";
skynet_ldap_backend.url = "git+https://gitlab.skynet.ie/compsoc/skynet/ldap/backend.git";
skynet_ldap_frontend.url = "git+https://gitlab.skynet.ie/compsoc/skynet/ldap/frontend.git";
skynet_website.url = "gitlab:compsoc%2Fskynet/website?host=gitlab.skynet.ie";
};
outputs = { self, nixpkgs,
@ -28,7 +30,7 @@
skynet_ldap_backend,
skynet_ldap_frontend,
...
}:
}@inputs:
let
system = "x86_64-linux";
in {
@ -42,6 +44,9 @@
system = system;
overlays = [];
};
specialArgs = {
inherit inputs;
};
};
# installed for each machine

4
machines/skynet.nix
View file

@ -10,7 +10,7 @@
*/
{ pkgs, lib, nodes, ... }:
{ pkgs, lib, nodes, inputs, ... }:
let
# name of the server, sets teh hostname and record for it
name = "skynet";
@ -80,6 +80,8 @@ in {
forceSSL = true;
useACMEHost = "skynet";
documentRoot = "${inputs.skynet_website.defaultPackage."x86_64-linux"}";
# skynet.ie/~username
enableUserDir = true;
};