tbarnouin/nixos-hypervisor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: tbarnouin:313913758a6a65497e3b208ca4737d9b15cc2209
Branches Tags
tbarnouin:main
..
compare: tbarnouin:88b468895630400ae1d6235442b4a6d1436739e0
Branches Tags
tbarnouin:main

No commits in common. "313913758a6a65497e3b208ca4737d9b15cc2209" and "88b468895630400ae1d6235442b4a6d1436739e0" have entirely different histories.
313913758a ... 88b4688956

7 changed files with 19 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/crowdsec.nix
View file

@ -602,14 +602,14 @@ in
console_path = mkDefault consoleFile;
profiles_path = mkDefault localProfilesFile;
online_client = mkDefault {
sharing = mkDefault true;
pull = mkDefault {
community = mkDefault true;
blocklists = mkDefault true;
};
credentials_path = cfg.settings.capi.credentialsFile;
};
#online_client = mkDefault {
# sharing = mkDefault true;
# pull = mkDefault {
# community = mkDefault true;
# blocklists = mkDefault true;
# };
# credentials_path = cfg.settings.capi.credentialsFile;
#};
};
};
prometheus = {

1
secrets.nix
View file

@ -35,7 +35,6 @@ in {
"secrets/postgresql-lapi-key.age".publicKeys = [tbarnouin postgresql];
"services/nginx/secrets/cs-lapi-key.age".publicKeys = [tbarnouin nginx];
"services/nginx/secrets/cs-capi-key.age".publicKeys = [tbarnouin nginx];
"services/minimalConfig/secrets/cs-lapi-key.age".publicKeys = users ++ systems;
"secrets/cs-lapi-key.age".publicKeys = users ++ systems;

6
services/nginx/default.nix
View file

@ -26,11 +26,6 @@ in {
file = ./secrets/cs-lapi-key.age;
owner = "crowdsec";
};
age.secrets.nginx-capi-key = {
file = ./secrets/cs-capi-key.age;
owner = "crowdsec";
mode = "600";
};
services = {
crowdsec-firewall-bouncer = {
enable = true;
@ -47,7 +42,6 @@ in {
listen_uri = "${cfg.proxy_ip}:8080";
};
lapi.credentialsFile = "${config.age.secrets.nginx-lapi-key.path}";
capi.credentialsFile = "${config.age.secrets.nginx-capi-key.path}";
};
hub.collections = [
"firix/authentik"

16
services/nginx/secrets/cs-capi-key.age
View file

@ -1,16 +0,0 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9Xa1ZYdyB0Q1Js
Kys0clVVOFQwVTUzV04yZ0cyUGM5QnJ6L3ZYNTZpZFVKeTRuZWtBCmYyV1RQR2xC
SExUeEx3MjYwOGgzU0s2U1gxV0Z0ajJ2RUE2bE9LQzFZWTgKLT4gc3NoLWVkMjU1
MTkgbXUwZm5BIEZRKzkxZnRvZThpSm9PUjc0U2VxU015RzRFWmQ5VVBiV0R3UHVJ
aDRuWEEKTXJFWnhRckZuNUVHeXdQMWxLZ1NpUEE4MktYdHhTT0dVbVJUK3NGOTZa
VQotPiAwUH1nLWdyZWFzZSBCdVZcJyZjaCBQXyFvUndDdCBMbk5mOWlUYyBVewoy
cHRlR1JvUEF2VGZ2SnRIaS9RTmJlVWVTd1dneDdGQjh5LzQxSnRTNSs4WmNRWWc5
WkFlNGlDMWw2NGdtOGpnCkNtTERzb24wSlVRT3pGSWZab2ZxQytCWlk2RTJ3MEhi
YzlOMTBmemFtYzJPRk80NldoRTY5MmJwbHhGUAotLS0gdHBOSHRxOXNtMmo1QnR5
N1c0clUxRnlKL2l5bU42ejVRQ0J1dEh2RzY5MAp+G3SFYm9lPhGr3CjIU11K8a8s
YIBgWVCSZ57Dr5LPKfy7kIWuJTFI/YAx1qN4fjwwEXuvyNVWPPVOeO1PAaLhHgAt
1Tx1V3u/LqyzYeXQWuazBZgHbLU+weKoBSmP8JCWXAyVOPzaQdpEDCT+hB/OFYdc
i7lKvTwttJK4Fvv2bVE6R1q1mRCiIz+sVLVydXVQHEqSgGP6o8L9cCfccoIDk3Oo
mtrP+ZEaJU9j4ZM/Y+Shsw/U2TBXOk18f9g+CidhCw==
-----END AGE ENCRYPTED FILE-----

29
services/nixarr/default.nix
View file

@ -1,5 +1,6 @@
{
config,
pkgs,
lib,
...
}: let
@ -38,34 +39,6 @@ in {
type = "syslog";
};
}
{
source = "journalctl";
journalctl_filter = [ "_SYSTEMD_UNIT=sonarr.service" ];
labels = {
type = "syslog";
};
}
{
source = "journalctl";
journalctl_filter = [ "_SYSTEMD_UNIT=bazarr.service" ];
labels = {
type = "syslog";
};
}
{
source = "journalctl";
journalctl_filter = [ "_SYSTEMD_UNIT=prowlarr.service" ];
labels = {
type = "syslog";
};
}
{
source = "journalctl";
journalctl_filter = [ "_SYSTEMD_UNIT=jellyseerr.service" ];
labels = {
type = "syslog";
};
}
];
};
};

22
systems/minimalLXCConfig.nix
View file

@ -1,5 +1,9 @@
{
config,
pkgs,
lib,
inputs,
modulesPath,
...
}: {
nix = {
@ -7,21 +11,6 @@
settings.trusted-users = ["root" "@wheel"];
};
nixpkgs.overlays = [
(final: prev: {
crowdsec = prev.crowdsec.overrideAttrs ( prev: rec {
pname = "crowdsec";
version = "1.6.4";
src = pkgs.fetchFromGitHub {
owner = "crowdsecurity";
repo = "${pname}";
tag = "v${version}";
hash = "sha256-/NTlj0kYCOMxShfoKdmouJTiookDjccUj5HFHLPn5HI=";
};
});
})
];
networking = {
firewall = {
enable = true;
@ -46,7 +35,7 @@
time.timeZone = "Europe/Paris";
console.keyMap = "fr";
i18n.defaultLocale = "fr_FR.UTF-8";
environment.sessionVariables = {
environment.sessionVariables = rec {
TERM = "xterm-256color";
};
@ -108,7 +97,6 @@
nmap
iperf3
netcat-openbsd
gnugrep
];
};

23
systems/minimalVMConfig.nix
View file

@ -1,5 +1,8 @@
{
pkgs,
config, pkgs,
lib,
inputs,
modulesPath,
...
}: {
nix = {
@ -7,21 +10,6 @@
settings.trusted-users = ["root" "@wheel"];
};
nixpkgs.overlays = [
(final: prev: {
crowdsec = prev.crowdsec.overrideAttrs ( prev: rec {
pname = "crowdsec";
version = "1.6.4";
src = pkgs.fetchFromGitHub {
owner = "crowdsecurity";
repo = "${pname}";
tag = "v${version}";
hash = "sha256-/NTlj0kYCOMxShfoKdmouJTiookDjccUj5HFHLPn5HI=";
};
});
})
];
networking = {
firewall = {
enable = true;
@ -33,7 +21,7 @@
time.timeZone = "Europe/Paris";
console.keyMap = "fr";
i18n.defaultLocale = "fr_FR.UTF-8";
environment.sessionVariables = {
environment.sessionVariables = rec {
TERM = "xterm-256color";
};
@ -95,7 +83,6 @@
nmap
iperf3
netcat-openbsd
gnugrep
];
};