diff --git a/Dockerfile b/Dockerfile index 1853c8d..faaace2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,7 @@ RUN set -eu && extra="" && \ COPY --chmod=755 ./src /run/ COPY --chmod=755 ./web /var/www/ COPY --chmod=755 --from=builder /qemu-host.bin /run/host.bin -COPY --chmod=744 ./web/nginx.conf /etc/nginx/sites-enabled/web.conf +COPY --chmod=744 ./web/conf/nginx.conf /etc/nginx/sites-enabled/web.conf VOLUME /storage EXPOSE 22 139 445 5000 diff --git a/src/reset.sh b/src/reset.sh index 57df21f..f804764 100644 --- a/src/reset.sh +++ b/src/reset.sh @@ -64,6 +64,7 @@ if [ -z "${CPU// /}" ] && grep -qi "model:" <<< "$CPI"; then fi CPU="${CPU// CPU/}" +CPU="${CPU// 8 Core/}" CPU="${CPU// 16 Core/}" CPU="${CPU// 32 Core/}" CPU="${CPU// 64 Core/}" diff --git a/web/nginx.conf b/web/conf/nginx.conf similarity index 100% rename from web/nginx.conf rename to web/conf/nginx.conf