diff options
author | adisbladis <adisbladis@gmail.com> | 2021-12-09 18:41:50 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-09 18:41:50 +1200 |
commit | 273018e39a8705582355ee9066fdfb2a6fb82226 (patch) | |
tree | af1d89c6456e5324874db0c6c01cdb1f7ff57625 /nixos | |
parent | f6ff5395f6b3b4f752d77fb7e0cea471a154ebd0 (diff) | |
parent | 79e66fce1c2b5a7de3e9a0e75b591ca9552a62ef (diff) |
Merge pull request #149769 from qowoz/podman-sort
nixos/podman: sort files into directories
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/module-list.nix | 3 | ||||
-rw-r--r-- | nixos/modules/virtualisation/podman/default.nix (renamed from nixos/modules/virtualisation/podman.nix) | 4 | ||||
-rw-r--r-- | nixos/modules/virtualisation/podman/dnsname.nix (renamed from nixos/modules/virtualisation/podman-dnsname.nix) | 0 | ||||
-rw-r--r-- | nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix (renamed from nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix) | 0 | ||||
-rw-r--r-- | nixos/modules/virtualisation/podman/network-socket.nix (renamed from nixos/modules/virtualisation/podman-network-socket.nix) | 4 | ||||
-rw-r--r-- | nixos/tests/all-tests.nix | 6 | ||||
-rw-r--r-- | nixos/tests/podman/default.nix (renamed from nixos/tests/podman.nix) | 2 | ||||
-rw-r--r-- | nixos/tests/podman/dnsname.nix (renamed from nixos/tests/podman-dnsname.nix) | 2 | ||||
-rw-r--r-- | nixos/tests/podman/tls-ghostunnel.nix (renamed from nixos/tests/podman-tls-ghostunnel.nix) | 2 |
9 files changed, 13 insertions, 10 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8cb7c39005c52..c83a692333845 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1192,8 +1192,7 @@ ./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 diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman/default.nix index 385475c84a1aa..94fd727a4b564 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -39,8 +39,8 @@ let in { imports = [ - ./podman-dnsname.nix - ./podman-network-socket.nix + ./dnsname.nix + ./network-socket.nix (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ]) ]; diff --git a/nixos/modules/virtualisation/podman-dnsname.nix b/nixos/modules/virtualisation/podman/dnsname.nix index beef19755079c..beef19755079c 100644 --- a/nixos/modules/virtualisation/podman-dnsname.nix +++ b/nixos/modules/virtualisation/podman/dnsname.nix diff --git a/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix b/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix index a0e7e433164a4..a0e7e433164a4 100644 --- a/nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix +++ b/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix diff --git a/nixos/modules/virtualisation/podman-network-socket.nix b/nixos/modules/virtualisation/podman/network-socket.nix index 1429164630b3e..94d8da9d2b614 100644 --- a/nixos/modules/virtualisation/podman-network-socket.nix +++ b/nixos/modules/virtualisation/podman/network-socket.nix @@ -9,6 +9,10 @@ let in { + imports = [ + ./network-socket-ghostunnel.nix + ]; + options.virtualisation.podman.networkSocket = { enable = mkOption { type = types.bool; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 63be67892017b..a1113ff631e38 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -369,9 +369,9 @@ in 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 {}; diff --git a/nixos/tests/podman.nix b/nixos/tests/podman/default.nix index 7eae575fd7f0e..b52a7f060ad66 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman/default.nix @@ -1,6 +1,6 @@ # 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 = { diff --git a/nixos/tests/podman-dnsname.nix b/nixos/tests/podman/dnsname.nix index dd352f754dcf2..3768ae79e0676 100644 --- a/nixos/tests/podman-dnsname.nix +++ b/nixos/tests/podman/dnsname.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ( +import ../make-test-python.nix ( { pkgs, lib, ... }: let inherit (pkgs) writeTextDir python3 curl; diff --git a/nixos/tests/podman-tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix index 0e687b199b262..c0bc47cc40b1b 100644 --- a/nixos/tests/podman-tls-ghostunnel.nix +++ b/nixos/tests/podman/tls-ghostunnel.nix @@ -1,7 +1,7 @@ /* 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" '' |