forked from hswaw/hscloud
hswaw/customs: fix warnings after nixpkgs update
Change-Id: I4d62e8fa73f16dbb51a1cacfa1bc70183b6bff2d Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1449 Reviewed-by: vuko <vuko@hackerspace.pl>
This commit is contained in:
parent
8fcffb2fa2
commit
740a52dec9
1 changed files with 9 additions and 15 deletions
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ config, pkgs, modulesPath, ... }:
|
||||
|
||||
let
|
||||
hw = builtins.fromJSON (builtins.readFile ./hw.json);
|
||||
|
@ -43,8 +43,8 @@ in {
|
|||
[
|
||||
./ulogd2/service.nix
|
||||
#./hardware-configuration.nix
|
||||
<nixpkgs/nixos/modules/profiles/minimal.nix>
|
||||
<nixpkgs/nixos/modules/profiles/all-hardware.nix>
|
||||
(modulesPath + "/profiles/minimal.nix")
|
||||
(modulesPath + "/profiles/all-hardware.nix")
|
||||
../../../bgpwtf/machines/modules/routing.nix
|
||||
./checkinator-tracker.nix
|
||||
./checkinator-web.nix
|
||||
|
@ -366,17 +366,13 @@ in {
|
|||
|
||||
services.logrotate = {
|
||||
enable = true;
|
||||
paths = {
|
||||
ulogd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
"/var/log/ulogd.pcap" = {
|
||||
frequency = "weekly";
|
||||
path = "/var/log/ulogd.pcap";
|
||||
extraConfig = ''
|
||||
postrotate
|
||||
postrotate = ''
|
||||
${pkgs.killall}/bin/killall -HUP ulogd
|
||||
endscript
|
||||
'';
|
||||
keep = 55;
|
||||
rotate = 55;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -439,10 +435,8 @@ in {
|
|||
'';
|
||||
services.nginx.resolver.addresses = [ "127.0.0.1" ];
|
||||
|
||||
security.acme = {
|
||||
email = "bofh@hackerspace.pl";
|
||||
acceptTerms = true;
|
||||
};
|
||||
security.acme.acceptTerms = true;
|
||||
security.acme.defaults.email = "bofh@hackerspace.pl";
|
||||
|
||||
services.nginx.virtualHosts."customs.hackerspace.pl" = {
|
||||
default = true;
|
||||
|
|
Loading…
Reference in a new issue