nixos/podman: sort files into directories

Makes codeowners, git history, etc. a bit simpler now that podman has expanded beyond the original single file module and test.

zowoq 79e66fce ce82da44

+2 -2
.github/CODEOWNERS
···
# Podman, CRI-O modules and related
/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq @adisbladis
/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq @adisbladis
-
/nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq @adisbladis
+
/nixos/modules/virtualisation/podman @NixOS/podman @zowoq @adisbladis
/nixos/tests/cri-o.nix @NixOS/podman @zowoq @adisbladis
-
/nixos/tests/podman.nix @NixOS/podman @zowoq @adisbladis
+
/nixos/tests/podman @NixOS/podman @zowoq @adisbladis
# Docker tools
/pkgs/build-support/docker @roberth @utdemir
+1 -2
nixos/modules/module-list.nix
···
./virtualisation/kvmgt.nix
./virtualisation/openvswitch.nix
./virtualisation/parallels-guest.nix
-
./virtualisation/podman.nix
-
./virtualisation/podman-network-socket-ghostunnel.nix
+
./virtualisation/podman/default.nix
./virtualisation/qemu-guest-agent.nix
./virtualisation/railcar.nix
./virtualisation/spice-usb-redirection.nix
nixos/modules/virtualisation/podman-dnsname.nix nixos/modules/virtualisation/podman/dnsname.nix
nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix
+4
nixos/modules/virtualisation/podman-network-socket.nix nixos/modules/virtualisation/podman/network-socket.nix
···
in
{
+
imports = [
+
./network-socket-ghostunnel.nix
+
];
+
options.virtualisation.podman.networkSocket = {
enable = mkOption {
type = types.bool;
+2 -2
nixos/modules/virtualisation/podman.nix nixos/modules/virtualisation/podman/default.nix
···
in
{
imports = [
-
./podman-dnsname.nix
-
./podman-network-socket.nix
+
./dnsname.nix
+
./network-socket.nix
(lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ])
];
+3 -3
nixos/tests/all-tests.nix
···
plikd = handleTest ./plikd.nix {};
plotinus = handleTest ./plotinus.nix {};
podgrab = handleTest ./podgrab.nix {};
-
podman = handleTestOn ["x86_64-linux"] ./podman.nix {};
-
podman-dnsname = handleTestOn ["x86_64-linux"] ./podman-dnsname.nix {};
-
podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman-tls-ghostunnel.nix {};
+
podman = handleTestOn ["x86_64-linux"] ./podman/default.nix {};
+
podman-dnsname = handleTestOn ["x86_64-linux"] ./podman/dnsname.nix {};
+
podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman/tls-ghostunnel.nix {};
pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {};
postfix = handleTest ./postfix.nix {};
postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {};
+1 -1
nixos/tests/podman-dnsname.nix nixos/tests/podman/dnsname.nix
···
-
import ./make-test-python.nix (
+
import ../make-test-python.nix (
{ pkgs, lib, ... }:
let
inherit (pkgs) writeTextDir python3 curl;
+1 -1
nixos/tests/podman-tls-ghostunnel.nix nixos/tests/podman/tls-ghostunnel.nix
···
/*
This test runs podman as a backend for the Docker CLI.
*/
-
import ./make-test-python.nix (
+
import ../make-test-python.nix (
{ pkgs, lib, ... }:
let gen-ca = pkgs.writeScript "gen-ca" ''
+1 -1
nixos/tests/podman.nix nixos/tests/podman/default.nix
···
# This test runs podman and checks if simple container starts
-
import ./make-test-python.nix (
+
import ../make-test-python.nix (
{ pkgs, lib, ... }: {
name = "podman";
meta = {