From def5346b4bb0572f3d35df23f988e79a925dfcd8 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Thu, 9 May 2019 20:52:15 +0300 Subject: using unix sockets --- configs/kvmd/main/v1-hdmi.yaml | 16 ++++++++-------- configs/kvmd/main/v1-vga.yaml | 16 ++++++++-------- configs/nginx/nginx.conf | 6 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'configs') diff --git a/configs/kvmd/main/v1-hdmi.yaml b/configs/kvmd/main/v1-hdmi.yaml index 7b886167..64dfbffb 100644 --- a/configs/kvmd/main/v1-hdmi.yaml +++ b/configs/kvmd/main/v1-hdmi.yaml @@ -5,8 +5,9 @@ logging: !include logging.yaml kvmd: server: - host: 127.0.0.1 - port: 8081 + unix: /run/kvmd.sock + unix_rm: true + unix_mode: 0660 auth: !include auth.yaml @@ -26,8 +27,7 @@ kvmd: device: /dev/kvmd-msd streamer: - host: 127.0.0.1 - port: 8082 + unix: /run/ustreamer.sock cmd: - "/usr/bin/ustreamer" - "--device=/dev/kvmd-video" @@ -38,11 +38,11 @@ kvmd: - "--workers=3" - "--quality={quality}" - "--desired-fps={desired_fps}" - - "--host={host}" - - "--port={port}" - "--drop-same-frames=30" + - "--unix={unix}" + - "--unix-rm" + - "--unix-mode=0660" ipmi: kvmd: - host: 127.0.0.1 - port: 8081 + unix: /run/kvmd.sock diff --git a/configs/kvmd/main/v1-vga.yaml b/configs/kvmd/main/v1-vga.yaml index 4a9baddc..0ace92e0 100644 --- a/configs/kvmd/main/v1-vga.yaml +++ b/configs/kvmd/main/v1-vga.yaml @@ -5,8 +5,9 @@ logging: !include logging.yaml kvmd: server: - host: 127.0.0.1 - port: 8081 + unix: /run/kvmd.sock + unix_rm: true + unix_mode: 0660 auth: !include auth.yaml @@ -29,8 +30,7 @@ kvmd: cap_pin: 17 conv_pin: 18 init_restart_after: 1 - host: 127.0.0.1 - port: 8082 + unix: /run/ustreamer.sock cmd: - "/usr/bin/ustreamer" - "--device=/dev/kvmd-video" @@ -43,10 +43,10 @@ kvmd: - "--height=576" - "--fake-width=800" - "--fake-height=600" - - "--host={host}" - - "--port={port}" + - "--unix={unix}" + - "--unix-rm" + - "--unix-mode=0660" ipmi: kvmd: - listen: 127.0.0.1 - port: 8081 + unix: /run/kvmd.sock diff --git a/configs/nginx/nginx.conf b/configs/nginx/nginx.conf index 444d5aab..7246f1e3 100644 --- a/configs/nginx/nginx.conf +++ b/configs/nginx/nginx.conf @@ -1,4 +1,4 @@ -user http; +user kvmd-nginx; worker_processes 4; # error_log /tmp/kvmd-nginx.error.log; @@ -35,11 +35,11 @@ http { uwsgi_temp_path /tmp/kvmd-nginx.uwsgi_temp; upstream kvmd { - server 127.0.0.1:8081 fail_timeout=0s max_fails=0; + server unix:/run/kvmd.sock fail_timeout=0s max_fails=0; } upstream ustreamer { - server 127.0.0.1:8082 fail_timeout=0s max_fails=0; + server unix:/run/ustreamer.sock fail_timeout=0s max_fails=0; } include /usr/share/kvmd/extras/*/nginx.ctx-http.conf; -- cgit v1.2.3