Testing updates to Podman
This commit is contained in:
parent
623b0dc33c
commit
f570e87ec3
2 changed files with 4 additions and 4 deletions
|
@ -4,7 +4,6 @@
|
||||||
boot.kernel.sysctl = {
|
boot.kernel.sysctl = {
|
||||||
"fs.inotify.max_user_watches" = 10485760;
|
"fs.inotify.max_user_watches" = 10485760;
|
||||||
"fs.inotify.max_user_instances" = 1024;
|
"fs.inotify.max_user_instances" = 1024;
|
||||||
"net.ipv4.ip_unprivileged_port_start" = 25;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualisation.podman = {
|
virtualisation.podman = {
|
||||||
|
@ -25,6 +24,6 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
# Add the docker telegraf listener
|
# Add the docker telegraf listener
|
||||||
services.telegraf.extraConfig.inputs.podman = {};
|
services.telegraf.extraConfig.inputs.docker = {};
|
||||||
users.users.telegraf.extraGroups = [ "docker" ];
|
users.users.telegraf.extraGroups = [ "podman" ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, desktop, lib, unstable-pkgs, pkgs, ... }:
|
{ config, desktop, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
ifExists = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
|
ifExists = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
|
||||||
in {
|
in {
|
||||||
|
@ -14,6 +14,7 @@ in {
|
||||||
extraGroups = [ "networkmanager" "wheel" ]
|
extraGroups = [ "networkmanager" "wheel" ]
|
||||||
++ ifExists [ "video" ]
|
++ ifExists [ "video" ]
|
||||||
++ ifExists [ "docker" ]
|
++ ifExists [ "docker" ]
|
||||||
|
++ ifExists [ "podman" ]
|
||||||
++ ifExists [ "syncthing" ];
|
++ ifExists [ "syncthing" ];
|
||||||
# mkpasswd -m sha-512
|
# mkpasswd -m sha-512
|
||||||
hashedPassword = "$y$j9T$wKLsIWaA4Gf63RvjedwLJ0$EHKL6BBJV0CAxEKcHHjaBqW085KJ/MGvmbyWzmcWOy6";
|
hashedPassword = "$y$j9T$wKLsIWaA4Gf63RvjedwLJ0$EHKL6BBJV0CAxEKcHHjaBqW085KJ/MGvmbyWzmcWOy6";
|
||||||
|
|
Loading…
Reference in a new issue