From b9e3b93105d4214de43ee596adff7cf661311780 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Mon, 26 Dec 2016 14:18:08 +0100
Subject: l: krebs.nginx -> services.nginx

---
 lass/1systems/prism.nix | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'lass/1systems/prism.nix')

diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 7646f716..efe79052 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -179,11 +179,9 @@ in {
       imports = [
         ../2configs/realwallpaper.nix
       ];
-      krebs.nginx.servers."lassul.us".locations = [
-        (lib.nameValuePair "/wallpaper.png" ''
-          alias /tmp/wallpaper.png;
-        '')
-      ];
+      services.nginx.virtualHosts."lassul.us".locations."/wallpaper.png".extraConfig = ''
+        alias /tmp/wallpaper.png;
+      '';
     }
     {
       environment.systemPackages = with pkgs; [
@@ -203,16 +201,13 @@ in {
       };
     }
     {
-      krebs.nginx = {
+      services.nginx = {
         enable = true;
-        servers.public = {
-          listen = [ "8088" ];
-          server-names = [ "default" ];
-          locations = [
-            (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
-              alias /home/$1/public_html$2;
-            '')
-          ];
+        virtualHosts.public = {
+          port = 8088;
+          locations."~ ^/~(.+?)(/.*)?\$".extraConfig = ''
+            alias /home/$1/public_html$2;
+          '';
         };
       };
       krebs.iptables.tables.filter.INPUT.rules = [
-- 
cgit v1.2.3