summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMaxim Devaev <[email protected]>2021-11-12 06:22:45 +0300
committerMaxim Devaev <[email protected]>2021-11-12 06:22:45 +0300
commit9c56f9433253574f098fd2664acf26aba69b05fe (patch)
tree48311d890b84c0aa91e1e63e5479b9dae167651e /Makefile
parenteb95257c600133dc1bb9c0b89493844183a2cb74 (diff)
testenv https redirect
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2ce67620..c0a95f5c 100644
--- a/Makefile
+++ b/Makefile
@@ -120,8 +120,7 @@ run: testenv $(TESTENV_GPIO)
&& test -d /sys/kernel/debug/gpio-mockup/`basename $(TESTENV_GPIO)`/ || (echo \"Missing GPIO mockup\" && exit 1) \
&& (socat PTY,link=$(TESTENV_HID) PTY,link=/dev/ttyS11 &) \
&& 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 testenv/redirect-to-https.conf /etc/kvmd/nginx \
&& 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 \