summaryrefslogtreecommitdiff
path: root/odin.nix
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-09-10 20:02:31 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-09-10 20:02:31 +0200
commit87db92f9f962e5cc777b173d9005d674fd2a2da6 (patch)
treeb1c5a33112a101d60d5d51bc88b22adf7bc50917 /odin.nix
parent0c9e3357613b9d60a5b1e6fd48b8dbcbe661b952 (diff)
downloadnixos-87db92f9f962e5cc777b173d9005d674fd2a2da6.tar
nixos-87db92f9f962e5cc777b173d9005d674fd2a2da6.tar.gz
nixos-87db92f9f962e5cc777b173d9005d674fd2a2da6.tar.bz2
nixos-87db92f9f962e5cc777b173d9005d674fd2a2da6.tar.xz
nixos-87db92f9f962e5cc777b173d9005d674fd2a2da6.zip
rtsp?
Diffstat (limited to 'odin.nix')
-rw-r--r--odin.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/odin.nix b/odin.nix
index 406387ed..091643cc 100644
--- a/odin.nix
+++ b/odin.nix
@@ -300,8 +300,7 @@
300 extraConfig = '' 300 extraConfig = ''
301 camera_name living-room 301 camera_name living-room
302 302
303 netcam_url mjpeg://ipcam02.hlidskjalf.yggdrasil:80/video2.mjpeg 303 netcam_url rtsp://ipcam02.hlidskjalf.yggdrasil:554/live2.sdp
304 netcam_keepalive on
305 width 1920 304 width 1920
306 height 1080 305 height 1080
307 306
@@ -479,8 +478,8 @@
479 478
480 locations = { 479 locations = {
481 "/bar/".proxyPass = "http://bar/"; 480 "/bar/".proxyPass = "http://bar/";
482 "/motion/cat-food.mjpeg".proxyPass = "http://localhost:8080"; 481 "/motion/cat-food.mjpeg".proxyPass = "http://localhost:8080/";
483 "/motion/living-room.mjpeg".proxyPass = "http://localhost:8081"; 482 "/motion/living-room.mjpeg".proxyPass = "http://localhost:8081/";
484 }; 483 };
485 }; 484 };
486 485