magic_rb/cluster
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/cluster synced 2024-11-22 08:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update nixpkgs and fix build errors

Browse source 
Signed-off-by: main <magic_rb@redalder.org>
This commit is contained in:
main 2022-02-26 18:37:07 +01:00
parent ab799f9490
commit d9ea727ef6
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
3 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
containers/hydra.nix
View file

@ -47,12 +47,12 @@
type.services = {};
};
nix = {
package = pkgs.nixUnstable.override {
package = pkgs.nixUnstable.overrideAttrs (old: {
patches =
[ ./Add-ignored_acls-setting.patch
./Ignore-system.nfs4_acl.patch
[ # ./Add-ignored_acls-setting.patch
# ./Ignore-system.nfs4_acl.patch
];
};
});
loadNixDb = true;
persistNix = "/nix-persist";
config = {

17
containers/ingress.nix
View file

@ -44,6 +44,19 @@ nglib.makeSystem {
init.services.nginx = {
shutdownOnExit = true;
};
system.activation =
{ resolv-conf =
nglib.dag.dagEntryBefore [ "certbot" ]
''
export PATH=${pkgs.busybox}/bin
mkdir -p /etc
echo "nameserver 8.8.8.8" > /etc/resolv.conf
'';
};
services.certbot = {
enable = true;
@ -58,8 +71,8 @@ nglib.makeSystem {
];
webroot = "/var/www/certbot";
email = "admin@redalder.org";
extraOptions = "--expand --keep-until-expiring --renew-with-new-domains";
};
extraOptions = "--expand --keep-until-expiring --renew-with-new-domains -v";
};
};
};
services.nginx = {

6
flake.lock
View file

@ -107,11 +107,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1639256808,
"narHash": "sha256-RRKWi6grwe5lioKUyfZNQ4ojc5kjUTX55fPNzsGH2PY=",
"lastModified": 1645433236,
"narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e675946ecde5606c505540de2024e2732bae4185",
"rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d",
"type": "github"
},
"original": {