diff options
Diffstat (limited to 'testenv')
| -rw-r--r-- | testenv/Dockerfile | 2 | ||||
| -rw-r--r-- | testenv/main.yaml | 16 | ||||
| -rw-r--r-- | testenv/run/.gitignore | 0 |
3 files changed, 10 insertions, 8 deletions
diff --git a/testenv/Dockerfile b/testenv/Dockerfile index 4d228f51..99dd8992 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -27,6 +27,7 @@ RUN pkg-install \ python-systemd \ python-dbus \ python-mako \ + libevent-patched \ nginx-mainline \ ustreamer \ socat \ @@ -36,6 +37,7 @@ RUN pkg-install \ COPY testenv/requirements.txt requirements.txt RUN pip install -r requirements.txt +RUN useradd -r -c "Pi-KVM Nginx Server" -s /sbin/nologin kvmd-nginx RUN mkdir -p /etc/kvmd/nginx CMD /bin/bash diff --git a/testenv/main.yaml b/testenv/main.yaml index c9774f8d..5647d62e 100644 --- a/testenv/main.yaml +++ b/testenv/main.yaml @@ -1,7 +1,8 @@ kvmd: server: - host: 0.0.0.0 - port: 8081 + unix: /run/kvmd.sock + unix_rm: true + unix_mode: 0666 auth: !include auth.yaml @@ -25,8 +26,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" @@ -34,12 +34,12 @@ kvmd: - "--desired-fps={desired_fps}" - "--width=800" - "--height=600" - - "--host=0.0.0.0" - - "--port={port}" + - "--unix={unix}" + - "--unix-rm" + - "--unix-mode=0666" ipmi: kvmd: - host: kvmd - port: 8081 + unix: /run/kvmd.sock logging: !include logging.yaml diff --git a/testenv/run/.gitignore b/testenv/run/.gitignore new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/testenv/run/.gitignore |