mirror of
https://git.sr.ht/~magic_rb/cluster
synced 2024-11-22 08:04:20 +01:00
Update nixpkgs and fix build errors
Signed-off-by: main <magic_rb@redalder.org>
This commit is contained in:
parent
ab799f9490
commit
d9ea727ef6
|
@ -47,12 +47,12 @@
|
||||||
type.services = {};
|
type.services = {};
|
||||||
};
|
};
|
||||||
nix = {
|
nix = {
|
||||||
package = pkgs.nixUnstable.override {
|
package = pkgs.nixUnstable.overrideAttrs (old: {
|
||||||
patches =
|
patches =
|
||||||
[ ./Add-ignored_acls-setting.patch
|
[ # ./Add-ignored_acls-setting.patch
|
||||||
./Ignore-system.nfs4_acl.patch
|
# ./Ignore-system.nfs4_acl.patch
|
||||||
];
|
];
|
||||||
};
|
});
|
||||||
loadNixDb = true;
|
loadNixDb = true;
|
||||||
persistNix = "/nix-persist";
|
persistNix = "/nix-persist";
|
||||||
config = {
|
config = {
|
||||||
|
|
|
@ -44,6 +44,19 @@ nglib.makeSystem {
|
||||||
init.services.nginx = {
|
init.services.nginx = {
|
||||||
shutdownOnExit = true;
|
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 = {
|
services.certbot = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
@ -58,8 +71,8 @@ nglib.makeSystem {
|
||||||
];
|
];
|
||||||
webroot = "/var/www/certbot";
|
webroot = "/var/www/certbot";
|
||||||
email = "admin@redalder.org";
|
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 = {
|
services.nginx = {
|
||||||
|
|
|
@ -107,11 +107,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1639256808,
|
"lastModified": 1645433236,
|
||||||
"narHash": "sha256-RRKWi6grwe5lioKUyfZNQ4ojc5kjUTX55fPNzsGH2PY=",
|
"narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e675946ecde5606c505540de2024e2732bae4185",
|
"rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
Loading…
Reference in a new issue