summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorDevaev Maxim <[email protected]>2018-08-16 23:04:55 +0300
committerDevaev Maxim <[email protected]>2018-08-16 23:04:55 +0300
commit18301d5f54d4405a76bee6632e440bdf72c7d488 (patch)
treea8ae2d9c86056cd78994a91dc6b26ccf88756789 /os
parentf2dde902ceebba4d9c9865295b73a83a30f1638c (diff)
proxy params, ssl permissins and mime types
Diffstat (limited to 'os')
-rw-r--r--os/platforms/v1/Dockerfile.part8
1 files changed, 6 insertions, 2 deletions
diff --git a/os/platforms/v1/Dockerfile.part b/os/platforms/v1/Dockerfile.part
index 35e097b6..685bc423 100644
--- a/os/platforms/v1/Dockerfile.part
+++ b/os/platforms/v1/Dockerfile.part
@@ -22,7 +22,9 @@ RUN sed -i -e "s/console=ttyAMA0\,115200//g" /boot/cmdline.txt \
&& sed -i -e "s/kgdboc=ttyAMA0\,115200//g" /boot/cmdline.txt
RUN systemctl mask [email protected]
-RUN sed -e "s/^#PROD//g" /usr/share/kvmd/configs/nginx/nginx.conf.example > /etc/nginx/nginx.conf
+RUN rm -rf /etc/nginx/* \
+ && cp /usr/share/kvmd/configs/nginx/* /etc/nginx/ \
+ && sed -i -e "s/^#PROD//g" /etc/nginx/nginx.conf
RUN cp /usr/share/kvmd/configs/kvmd/v1.yaml /etc/kvmd.yaml
ARG WEBUI_ADMIN_PASSWD
@@ -37,4 +39,6 @@ RUN mkdir /etc/nginx/ssl \
&& openssl req -new -x509 -nodes -newkey rsa:4096 -keyout server.key -out server.crt -days 3650 \
-subj "/C=RU/ST=Moscow/L=Moscow/O=Pi-KVM/OU=Pi-KVM/CN=localhost" \
&& chmod 400 server.key \
- && chmod 444 server.crt
+ && chmod 444 server.crt \
+ && chmod 750 /etc/nginx/ssl \
+ && chown -R root:http /etc/nginx/ssl