diff options
| author | Maxim Devaev <[email protected]> | 2024-02-03 16:11:34 +0200 |
|---|---|---|
| committer | Maxim Devaev <[email protected]> | 2024-02-03 16:13:45 +0200 |
| commit | 8d702f8cc26e5a0665ce2f0f0ea403e8d0d4ad79 (patch) | |
| tree | 07ae5354a22564335de652e8a02e1ce059955bb4 /testenv | |
| parent | 272e3bf5e95ed9ad8e304f51c3f62ada53faaa63 (diff) | |
kvmd-nginx-mkconf: Render nginx config with kvmd settings
Diffstat (limited to 'testenv')
| -rw-r--r-- | testenv/Dockerfile | 1 | ||||
| -rw-r--r-- | testenv/redirect-to-https.conf | 3 | ||||
| -rw-r--r-- | testenv/v2-hdmi-rpi4.override.yaml | 6 | ||||
| -rw-r--r-- | testenv/v2-hdmiusb-rpi4.override.yaml | 6 |
4 files changed, 13 insertions, 3 deletions
diff --git a/testenv/Dockerfile b/testenv/Dockerfile index 036a8380..2d9d2269 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -57,6 +57,7 @@ RUN pacman --noconfirm --ask=4 -Syy \ python-pam \ python-pillow \ python-xlib \ + python-mako \ libxkbcommon \ python-hidapi \ python-ldap \ diff --git a/testenv/redirect-to-https.conf b/testenv/redirect-to-https.conf deleted file mode 100644 index 11796e29..00000000 --- a/testenv/redirect-to-https.conf +++ /dev/null @@ -1,3 +0,0 @@ -location / { - return 301 https://$host:4430$request_uri; -} diff --git a/testenv/v2-hdmi-rpi4.override.yaml b/testenv/v2-hdmi-rpi4.override.yaml index be93d455..f8a301f1 100644 --- a/testenv/v2-hdmi-rpi4.override.yaml +++ b/testenv/v2-hdmi-rpi4.override.yaml @@ -160,6 +160,12 @@ otgnet: pre_stop_cmd: - "/bin/true" +nginx: + http: + port: 8080 + https: + port: 4430 + janus: cmd: - "/bin/true" diff --git a/testenv/v2-hdmiusb-rpi4.override.yaml b/testenv/v2-hdmiusb-rpi4.override.yaml index f1d57089..8d5568f6 100644 --- a/testenv/v2-hdmiusb-rpi4.override.yaml +++ b/testenv/v2-hdmiusb-rpi4.override.yaml @@ -56,6 +56,12 @@ otgnet: pre_stop_cmd: - "/bin/true" +nginx: + http: + port: 8080 + https: + port: 4430 + janus: cmd: - "/bin/true" |