b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos/podman: sort files into directories

Browse source 
Makes codeowners, git history, etc. a bit simpler now that podman has expanded beyond the original single file module and test.
This commit is contained in:
zowoq 2021-12-09 12:10:44 +10:00
parent ce82da442b
commit 79e66fce1c
10 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/CODEOWNERS vendored
View file

@ -219,9 +219,9 @@
# Podman, CRI-O modules and related # Podman, CRI-O modules and related
/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq @adisbladis /nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq @adisbladis
/nixos/modules/virtualisation/cri-o.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/cri-o.nix @NixOS/podman @zowoq @adisbladis
/nixos/tests/podman.nix @NixOS/podman @zowoq @adisbladis /nixos/tests/podman @NixOS/podman @zowoq @adisbladis
# Docker tools # Docker tools
/pkgs/build-support/docker @roberth @utdemir /pkgs/build-support/docker @roberth @utdemir

3
nixos/modules/module-list.nix
View file

@ -1192,8 +1192,7 @@
./virtualisation/kvmgt.nix ./virtualisation/kvmgt.nix
./virtualisation/openvswitch.nix ./virtualisation/openvswitch.nix
./virtualisation/parallels-guest.nix ./virtualisation/parallels-guest.nix
./virtualisation/podman.nix ./virtualisation/podman/default.nix
./virtualisation/podman-network-socket-ghostunnel.nix
./virtualisation/qemu-guest-agent.nix ./virtualisation/qemu-guest-agent.nix
./virtualisation/railcar.nix ./virtualisation/railcar.nix
./virtualisation/spice-usb-redirection.nix ./virtualisation/spice-usb-redirection.nix

4
nixos/modules/virtualisation/podman.nix → nixos/modules/virtualisation/podman/default.nix
View file

@ -39,8 +39,8 @@ let
in in
{ {
imports = [ imports = [
./podman-dnsname.nix ./dnsname.nix
./podman-network-socket.nix ./network-socket.nix
(lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ]) (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ])
]; ];

0
nixos/modules/virtualisation/podman-dnsname.nix → nixos/modules/virtualisation/podman/dnsname.nix
View file

0
nixos/modules/virtualisation/podman-network-socket-ghostunnel.nix → nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix
View file

4
nixos/modules/virtualisation/podman-network-socket.nix → nixos/modules/virtualisation/podman/network-socket.nix
View file

@ -9,6 +9,10 @@ let
in in
{ {
imports = [
./network-socket-ghostunnel.nix
];
options.virtualisation.podman.networkSocket = { options.virtualisation.podman.networkSocket = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;

6
nixos/tests/all-tests.nix
View file

@ -369,9 +369,9 @@ in
plikd = handleTest ./plikd.nix {}; plikd = handleTest ./plikd.nix {};
plotinus = handleTest ./plotinus.nix {}; plotinus = handleTest ./plotinus.nix {};
podgrab = handleTest ./podgrab.nix {}; podgrab = handleTest ./podgrab.nix {};
podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; podman = handleTestOn ["x86_64-linux"] ./podman/default.nix {};
podman-dnsname = handleTestOn ["x86_64-linux"] ./podman-dnsname.nix {}; podman-dnsname = handleTestOn ["x86_64-linux"] ./podman/dnsname.nix {};
podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman-tls-ghostunnel.nix {}; podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman/tls-ghostunnel.nix {};
pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {}; pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {};
postfix = handleTest ./postfix.nix {}; postfix = handleTest ./postfix.nix {};
postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {}; postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {};

2
nixos/tests/podman.nix → nixos/tests/podman/default.nix
View file

@ -1,6 +1,6 @@
# This test runs podman and checks if simple container starts # This test runs podman and checks if simple container starts
import ./make-test-python.nix ( import ../make-test-python.nix (
{ pkgs, lib, ... }: { { pkgs, lib, ... }: {
name = "podman"; name = "podman";
meta = { meta = {

2
nixos/tests/podman-dnsname.nix → nixos/tests/podman/dnsname.nix
View file

@ -1,4 +1,4 @@
import ./make-test-python.nix ( import ../make-test-python.nix (
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
inherit (pkgs) writeTextDir python3 curl; inherit (pkgs) writeTextDir python3 curl;

2
nixos/tests/podman-tls-ghostunnel.nix → nixos/tests/podman/tls-ghostunnel.nix
View file

@ -1,7 +1,7 @@
/* /*
This test runs podman as a backend for the Docker CLI. This test runs podman as a backend for the Docker CLI.
*/ */
import ./make-test-python.nix ( import ../make-test-python.nix (
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let gen-ca = pkgs.writeScript "gen-ca" '' let gen-ca = pkgs.writeScript "gen-ca" ''