GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 17:20:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed path to nginx.conf

Browse Source
This commit is contained in:
Devaev Maxim 2018-08-09 04:53:12 +03:00
parent cf4f414b5f
commit 6f9f745588
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/Makefile
View File

@ -15,7 +15,7 @@ _pikvm: $(_BUILD_DIR)
rm -rf $(_BUILD_DIR)/builder/scripts/pikvm rm -rf $(_BUILD_DIR)/builder/scripts/pikvm
cp -a platforms/$(PIKVM_PLATFORM) $(_BUILD_DIR)/stages/pikvm cp -a platforms/$(PIKVM_PLATFORM) $(_BUILD_DIR)/stages/pikvm
cd $(_BUILD_DIR) && make binfmt && make _rpi \ cd $(_BUILD_DIR) && make binfmt && make _rpi \
BUILD_OPTS="--build-arg KVMD_VERSION=$(_KVMD_VERSION) --build-arg NEW_SSH_KEYGEN=$(shell uuidgen)" \ BUILD_OPTS="--build-arg KVMD_VERSION=$(_KVMD_VERSION) --build-arg NEW_SSH_KEYGEN=$(shell uuidgen) --build-arg NEW_HTTPS_CERT=$(shell uuidgen)" \
PROJECT=pi-kvm \ PROJECT=pi-kvm \
PLATFORM=rpi-2 \ PLATFORM=rpi-2 \
STAGES="__init__ os watchdog ro pikvm rootssh __cleanup__" \ STAGES="__init__ os watchdog ro pikvm rootssh __cleanup__" \

5
os/platforms/v1/Dockerfile.part
View File

@ -19,9 +19,12 @@ RUN sed -i -e "s/console=ttyAMA0\,115200//g" /boot/cmdline.txt \
&& sed -i -e "s/kgdboc=ttyAMA0\,115200//g" /boot/cmdline.txt && sed -i -e "s/kgdboc=ttyAMA0\,115200//g" /boot/cmdline.txt
RUN systemctl mask serial-getty@ttyAMA0.service RUN systemctl mask serial-getty@ttyAMA0.service
RUN cp /usr/share/kvmd/configs/nginx/nginx.conf.example /etc/nginx/ RUN cp /usr/share/kvmd/configs/nginx/nginx.conf.example /etc/nginx/nginx.conf
RUN cp /usr/share/kvmd/configs/kvmd/v1.yaml /etc/kvmd.yaml RUN cp /usr/share/kvmd/configs/kvmd/v1.yaml /etc/kvmd.yaml
ARG NEW_HTTPS_CERT
ENV NEW_HTTPS_CERT $NEW_HTTPS_CERT
RUN echo $NEW_HTTPS_CERT
RUN mkdir /etc/nginx/ssl \ RUN mkdir /etc/nginx/ssl \
&& cd /etc/nginx/ssl \ && cd /etc/nginx/ssl \
&& openssl req -new -x509 -nodes -newkey rsa:4096 -keyout server.key -out server.crt -days 3650 \ && openssl req -new -x509 -nodes -newkey rsa:4096 -keyout server.key -out server.crt -days 3650 \