diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 29 |
1 files changed, 20 insertions, 9 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 \ |