diff --git a/Dockerfile b/Dockerfile index cb1864f..127c0ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,7 @@ COPY --chmod=664 ./web/conf/mandatory.json /usr/share/novnc COPY --chmod=744 ./web/conf/nginx.conf /etc/nginx/sites-enabled/web.conf VOLUME /storage -EXPOSE 22 80 5900 +EXPOSE 22 5900 8006 ENV CPU_CORES="2" ENV RAM_SIZE="2G" diff --git a/compose.yml b/compose.yml index b5b3f68..de1abd6 100644 --- a/compose.yml +++ b/compose.yml @@ -10,7 +10,7 @@ services: cap_add: - NET_ADMIN ports: - - 8006:80 + - 8006:8006 volumes: - ./qemu:/storage restart: always diff --git a/kubernetes.yml b/kubernetes.yml index d27205b..5861ee5 100644 --- a/kubernetes.yml +++ b/kubernetes.yml @@ -76,7 +76,7 @@ spec: - name: http port: 8006 protocol: TCP - targetPort: 80 + targetPort: 8006 - name: vnc port: 5900 protocol: TCP diff --git a/readme.md b/readme.md index e16d738..8287c5a 100644 --- a/readme.md +++ b/readme.md @@ -38,7 +38,7 @@ services: cap_add: - NET_ADMIN ports: - - 8006:80 + - 8006:8006 volumes: - ./qemu:/storage restart: always @@ -48,7 +48,7 @@ services: Via Docker CLI: ```bash -docker run -it --rm --name qemu -e "BOOT=alpine" -p 8006:80 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v ${PWD:-.}/qemu:/storage --stop-timeout 120 qemux/qemu +docker run -it --rm --name qemu -e "BOOT=alpine" -p 8006:8006 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v ${PWD:-.}/qemu:/storage --stop-timeout 120 qemux/qemu ``` Via Kubernetes: diff --git a/src/reset.sh b/src/reset.sh index 7d7f8e9..35eca8d 100644 --- a/src/reset.sh +++ b/src/reset.sh @@ -315,12 +315,10 @@ echo "$user:{PLAIN}${PASS:-}" > /etc/nginx/.htpasswd # shellcheck disable=SC2143 if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then - sed -i "s/listen 80;/listen [::]:80 ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf sed -i "s/listen 8006 default_server;/listen [::]:8006 default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf else - sed -i "s/listen [::]:80 ipv6only=off;/listen 80;/g" /etc/nginx/sites-enabled/web.conf sed -i "s/listen [::]:8006 default_server ipv6only=off;/listen 8006 default_server;/g" /etc/nginx/sites-enabled/web.conf fi diff --git a/web/conf/nginx.conf b/web/conf/nginx.conf index 71a922b..ea657f7 100644 --- a/web/conf/nginx.conf +++ b/web/conf/nginx.conf @@ -1,6 +1,5 @@ server { - listen 80; listen 8006 default_server; autoindex on;