diff options
| author | Devaev Maxim <[email protected]> | 2021-02-15 05:51:35 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2021-02-15 05:51:42 +0300 |
| commit | 36e3013f18222366c252eeb42bdcb949782ac8a8 (patch) | |
| tree | dd17dc44e6fa17f71f365f38e1f3dd05ac0f4267 | |
| parent | 308832f98679ca74f5d3975357c18c6268d650bd (diff) | |
fixed Makefile for vnc ssl
| -rw-r--r-- | Makefile | 29 | ||||
| -rw-r--r-- | testenv/Dockerfile | 2 |
2 files changed, 21 insertions, 10 deletions
@@ -57,11 +57,15 @@ testenv: --volume `pwd`/testenv:/src/testenv:rw \ -t $(TESTENV_IMAGE) bash -c " \ groupadd kvmd-nginx \ + && groupadd kvmd-vnc \ && /src/scripts/kvmd-gencert --do-the-thing \ - && chown -R root:root /etc/kvmd/nginx/ssl \ - && chmod 664 /etc/kvmd/nginx/ssl/* \ - && chmod 775 /etc/kvmd/nginx/ssl \ - && mv /etc/kvmd/nginx/ssl /src/testenv/.ssl \ + && /src/scripts/kvmd-gencert --do-the-thing --vnc \ + && chown -R root:root /etc/kvmd/{nginx,vnc}/ssl \ + && chmod 664 /etc/kvmd/{nginx,vnc}/ssl/* \ + && chmod 775 /etc/kvmd/{nginx,vnc}/ssl \ + && mkdir /src/testenv/.ssl \ + && mv /etc/kvmd/nginx/ssl /src/testenv/.ssl/nginx \ + && mv /etc/kvmd/vnc/ssl /src/testenv/.ssl/vnc \ " @@ -74,7 +78,8 @@ tox: testenv --volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \ --volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps:ro \ -t $(TESTENV_IMAGE) bash -c " \ - cp -a /src/testenv/.ssl /etc/kvmd/nginx/ssl \ + cp -a /src/testenv/.ssl/nginx /etc/kvmd/nginx/ssl \ + && cp -a /src/testenv/.ssl/vnc /etc/kvmd/vnc/ssl \ && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ @@ -114,7 +119,8 @@ run: testenv $(TESTENV_GPIO) && cp -r /usr/share/kvmd/configs.default/nginx/* /etc/kvmd/nginx \ && sed -i '$$ s/.$$//' /etc/kvmd/nginx/nginx.conf \ && cat testenv/nginx.append.conf >> /etc/kvmd/nginx/nginx.conf \ - && cp -a /testenv/.ssl /etc/kvmd/nginx/ssl \ + && cp -a /testenv/.ssl/nginx /etc/kvmd/nginx/ssl \ + && cp -a /testenv/.ssl/vnc /etc/kvmd/vnc/ssl \ && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ @@ -135,7 +141,9 @@ run-cfg: testenv --volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \ --volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps:ro \ -it $(TESTENV_IMAGE) /bin/bash -c " \ - cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ + cp -a /testenv/.ssl/nginx /etc/kvmd/nginx/ssl \ + && cp -a /testenv/.ssl/vnc /etc/kvmd/vnc/ssl \ + && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ && cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ @@ -153,7 +161,9 @@ run-ipmi: testenv --volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps:ro \ --publish 6230:623/udp \ -it $(TESTENV_IMAGE) /bin/bash -c " \ - cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ + cp -a /testenv/.ssl/nginx /etc/kvmd/nginx/ssl \ + && cp -a /testenv/.ssl/vnc /etc/kvmd/vnc/ssl \ + && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ && cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ @@ -171,7 +181,8 @@ run-vnc: testenv --volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps:ro \ --publish 5900:5900/tcp \ -it $(TESTENV_IMAGE) /bin/bash -c " \ - cp -a /testenv/.ssl /etc/kvmd/nginx/ssl \ + cp -a /testenv/.ssl/nginx /etc/kvmd/nginx/ssl \ + && cp -a /testenv/.ssl/vnc /etc/kvmd/vnc/ssl \ && cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \ && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ diff --git a/testenv/Dockerfile b/testenv/Dockerfile index e91e1031..498d8c56 100644 --- a/testenv/Dockerfile +++ b/testenv/Dockerfile @@ -71,7 +71,7 @@ RUN git clone https://github.com/pikvm/ustreamer \ && rm -rf ustreamer RUN mkdir -p \ - /etc/kvmd/nginx \ + /etc/kvmd/{nginx,vnc} \ /var/lib/kvmd/msd/{images,meta} \ /opt/vc/bin \ /fake_sysfs/sys/kernel/config/usb_gadget/kvmd/functions/mass_storage.usb0/lun.0 \ |