summary refs log tree commit diff
path: root/nixos/tests/upnp.nix
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-11-04 16:24:55 -0500
committerAaron Andersen <aaron@fosslib.net>2019-12-24 20:27:48 -0500
commit79215f0df1ddf4bf0db7dc4c5789f8dae9f9bb02 (patch)
tree8ceee3dc89f5c391a72389fef26adf505b3d80f5 /nixos/tests/upnp.nix
parentd5bbb86bcb70cf3a5b252bd5d6d7d17b3e7921eb (diff)
downloadnixpkgs-79215f0df1ddf4bf0db7dc4c5789f8dae9f9bb02.tar
nixpkgs-79215f0df1ddf4bf0db7dc4c5789f8dae9f9bb02.tar.gz
nixpkgs-79215f0df1ddf4bf0db7dc4c5789f8dae9f9bb02.tar.bz2
nixpkgs-79215f0df1ddf4bf0db7dc4c5789f8dae9f9bb02.tar.lz
nixpkgs-79215f0df1ddf4bf0db7dc4c5789f8dae9f9bb02.tar.xz
nixpkgs-79215f0df1ddf4bf0db7dc4c5789f8dae9f9bb02.tar.zst
nixpkgs-79215f0df1ddf4bf0db7dc4c5789f8dae9f9bb02.zip
nixos/httpd: limit serving web content to virtual hosts, convert virtualHosts option type from listOf to attrsOf, add ACME integration
Diffstat (limited to 'nixos/tests/upnp.nix')
-rw-r--r--nixos/tests/upnp.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix
index d2e7fdd4fbe..a7d837ea070 100644
--- a/nixos/tests/upnp.nix
+++ b/nixos/tests/upnp.nix
@@ -56,9 +56,11 @@ in
           networking.firewall.enable = false;
 
           services.httpd.enable = true;
-          services.httpd.listen = [{ ip = "*"; port = 9000; }];
-          services.httpd.adminAddr = "foo@example.org";
-          services.httpd.documentRoot = "/tmp";
+          services.httpd.virtualHosts.localhost = {
+            listen = [{ ip = "*"; port = 9000; }];
+            adminAddr = "foo@example.org";
+            documentRoot = "/tmp";
+          };
         };
 
       client2 =